diff --git a/basis/concurrency/count-downs/count-downs-tests.factor b/basis/concurrency/count-downs/count-downs-tests.factor
index d03245bd25..a39d68448a 100644
--- a/basis/concurrency/count-downs/count-downs-tests.factor
+++ b/basis/concurrency/count-downs/count-downs-tests.factor
@@ -1,5 +1,5 @@
 USING: concurrency.count-downs threads kernel tools.test ;
-IN: concurrency.count-downs.tests`
+IN: concurrency.count-downs.tests
 
 { } [ 0 <count-down> await ] unit-test
 
diff --git a/basis/interval-maps/interval-maps-tests.factor b/basis/interval-maps/interval-maps-tests.factor
index 5438bd030b..70ad326372 100644
--- a/basis/interval-maps/interval-maps-tests.factor
+++ b/basis/interval-maps/interval-maps-tests.factor
@@ -1,5 +1,5 @@
 USING: kernel namespaces interval-maps tools.test ;
-IN: interval-maps.test
+IN: interval-maps.tests
 
 SYMBOL: test
 
diff --git a/basis/inverse/inverse-tests.factor b/basis/inverse/inverse-tests.factor
index 824dc3b0ec..18f4ad32b4 100644
--- a/basis/inverse/inverse-tests.factor
+++ b/basis/inverse/inverse-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: inverse tools.test arrays math kernel sequences
 math.functions math.constants continuations combinators.smart ;
-IN: inverse-tests
+IN: inverse.tests
 
 { 2 } [ { 3 2 } [ 3 swap 2array ] undo ] unit-test
 [ { 3 4 } [ dup 2array ] undo ] must-fail
diff --git a/basis/io/encodings/strict/strict-tests.factor b/basis/io/encodings/strict/strict-tests.factor
index e8ffe435fb..ba6d93aa26 100644
--- a/basis/io/encodings/strict/strict-tests.factor
+++ b/basis/io/encodings/strict/strict-tests.factor
@@ -1,6 +1,6 @@
 USING: io.encodings.strict io.encodings.ascii tools.test
 arrays io.encodings.string ;
-IN: io.encodings.strict.test
+IN: io.encodings.strict.tests
 
 { { 0xfffd } } [ { 128 } ascii decode >array ] unit-test
 [ { 128 } ascii strict decode ] must-fail
diff --git a/basis/linked-assocs/linked-assocs-tests.factor b/basis/linked-assocs/linked-assocs-tests.factor
index e4b291ce23..feba3fc9e7 100644
--- a/basis/linked-assocs/linked-assocs-tests.factor
+++ b/basis/linked-assocs/linked-assocs-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors assocs kernel linked-assocs math sequences
 tools.test ;
-IN: linked-assocs.test
+IN: linked-assocs.tests
 
 { { 1 2 3 } } [
     <linked-hash> 1 "b" pick set-at
diff --git a/basis/locals/types/types-tests.factor b/basis/locals/types/types-tests.factor
index 91db776b4b..c00a417ff4 100644
--- a/basis/locals/types/types-tests.factor
+++ b/basis/locals/types/types-tests.factor
@@ -1,5 +1,5 @@
 USING: accessors compiler.units kernel locals.types tools.test words ;
-IN: locals.types.test
+IN: locals.types.tests
 
 { t } [
     [ "hello" <local> ] with-compilation-unit "local?" word-prop
diff --git a/basis/regexp/regexp-tests.factor b/basis/regexp/regexp-tests.factor
index d03e37b7a6..30ec30a6d9 100644
--- a/basis/regexp/regexp-tests.factor
+++ b/basis/regexp/regexp-tests.factor
@@ -1,6 +1,6 @@
 USING: arrays regexp tools.test kernel sequences regexp.parser
 regexp.private eval strings multiline accessors ;
-IN: regexp-tests
+IN: regexp.tests
 
 { f } [ "b" "a*" <regexp> matches? ] unit-test
 { t } [ "" "a*" <regexp> matches? ] unit-test
diff --git a/extra/calendar/elapsed/elapsed-tests.factor b/extra/calendar/elapsed/elapsed-tests.factor
index 881c61451d..4373f4f207 100644
--- a/extra/calendar/elapsed/elapsed-tests.factor
+++ b/extra/calendar/elapsed/elapsed-tests.factor
@@ -3,7 +3,7 @@
 
 USING: calendar calendar.elapsed kernel tools.test ;
 
-IN: calendar.elapsed.test
+IN: calendar.elapsed.tests
 
 [ -1 elapsed-time ] [ "negative seconds" = ] must-fail-with
 
diff --git a/extra/jamshred/oint/oint-tests.factor b/extra/jamshred/oint/oint-tests.factor
index dadd6fb255..3b52e4b1b6 100644
--- a/extra/jamshred/oint/oint-tests.factor
+++ b/extra/jamshred/oint/oint-tests.factor
@@ -1,5 +1,5 @@
 USING: jamshred.oint tools.test ;
-IN: jamshred.oint-tests
+IN: jamshred.oint.tests
 
 { { 0 -1 -1 } } [ { 0 1 -1 } { 0 -1 0 } reflect ] unit-test
 { { 0 1 0 } } [ { 1 1 0 } { 1 0 0 } proj-perp ] unit-test
diff --git a/extra/math/extras/extras-tests.factor b/extra/math/extras/extras-tests.factor
index 118ea884a4..4b4fb91e3e 100644
--- a/extra/math/extras/extras-tests.factor
+++ b/extra/math/extras/extras-tests.factor
@@ -4,7 +4,7 @@
 USING: arrays kernel math math.extras math.ranges sequences
 tools.test ;
 
-IN: math.extras.test
+IN: math.extras.tests
 
 { { 1 -1/2 1/6 0 -1/30 0 1/42 0 -1/30 0 } }
 [ 10 <iota> [ bernoulli ] map ] unit-test