diff --git a/tests/errmsgs/undeclared_routime.nim b/tests/errmsgs/undeclared_routime.nim
deleted file mode 100644
index 7ef12cc0e7690..0000000000000
--- a/tests/errmsgs/undeclared_routime.nim
+++ /dev/null
@@ -1,13 +0,0 @@
-discard """
-cmd: '''nim c --hints:off $file'''
-errormsg: "attempting to call routine: 'myiter'"
-nimout: '''undeclared_routime.nim(13, 15) Error: attempting to call routine: 'myiter'
-  found 'undeclared_routime.myiter(a: string)[iterator declared in undeclared_routime.nim(10, 9)]'
-  found 'undeclared_routime.myiter()[iterator declared in undeclared_routime.nim(11, 9)]'
-'''
-"""
-
-iterator myiter(a:string): int = discard
-iterator myiter(): int = discard
-
-let a = myiter(1)
diff --git a/tests/errmsgs/undeclared_routine.nim b/tests/errmsgs/undeclared_routine.nim
new file mode 100644
index 0000000000000..126ade52ae401
--- /dev/null
+++ b/tests/errmsgs/undeclared_routine.nim
@@ -0,0 +1,13 @@
+discard """
+cmd: '''nim c --hints:off $file'''
+errormsg: "attempting to call routine: 'myiter'"
+nimout: '''undeclared_routine.nim(13, 15) Error: attempting to call routine: 'myiter'
+  found 'undeclared_routine.myiter(a: string)[iterator declared in undeclared_routine.nim(10, 9)]'
+  found 'undeclared_routine.myiter()[iterator declared in undeclared_routine.nim(11, 9)]'
+'''
+"""
+
+iterator myiter(a:string): int = discard
+iterator myiter(): int = discard
+
+let a = myiter(1)
diff --git a/tests/errmsgs/undeclared_routime2.nim b/tests/errmsgs/undeclared_routine2.nim
similarity index 100%
rename from tests/errmsgs/undeclared_routime2.nim
rename to tests/errmsgs/undeclared_routine2.nim
diff --git a/tests/errmsgs/undeclared_routime3.nim b/tests/errmsgs/undeclared_routine3.nim
similarity index 62%
rename from tests/errmsgs/undeclared_routime3.nim
rename to tests/errmsgs/undeclared_routine3.nim
index 052adfc081dc5..5378719008837 100644
--- a/tests/errmsgs/undeclared_routime3.nim
+++ b/tests/errmsgs/undeclared_routine3.nim
@@ -1,8 +1,8 @@
 discard """
 cmd: '''nim c --hints:off $file'''
 errormsg: "undeclared field: 'bar'"
-nimout: '''undeclared_routime3.nim(13, 10) Error: undeclared field: 'bar'
-  found 'undeclared_routime3.bar()[declared in undeclared_routime3.nim(12, 9)]' of kind 'iterator'
+nimout: '''undeclared_routine3.nim(13, 10) Error: undeclared field: 'bar'
+  found 'undeclared_routine3.bar()[declared in undeclared_routine3.nim(12, 9)]' of kind 'iterator'
 '''
 """
 
diff --git a/tests/errmsgs/undeclared_routime4.nim b/tests/errmsgs/undeclared_routine4.nim
similarity index 69%
rename from tests/errmsgs/undeclared_routime4.nim
rename to tests/errmsgs/undeclared_routine4.nim
index 674caa421d125..9012a983f3601 100644
--- a/tests/errmsgs/undeclared_routime4.nim
+++ b/tests/errmsgs/undeclared_routine4.nim
@@ -1,7 +1,7 @@
 discard """
 cmd: '''nim c --hints:off $file'''
 errormsg: "undeclared field: 'bar'"
-nimout: '''undeclared_routime4.nim(10, 10) Error: undeclared field: 'bar'
+nimout: '''undeclared_routine4.nim(10, 10) Error: undeclared field: 'bar'
 '''
 """
 
diff --git a/tests/errmsgs/undeclared_routime5.nim b/tests/errmsgs/undeclared_routine5.nim
similarity index 67%
rename from tests/errmsgs/undeclared_routime5.nim
rename to tests/errmsgs/undeclared_routine5.nim
index 4394134abc897..0387448a4b783 100644
--- a/tests/errmsgs/undeclared_routime5.nim
+++ b/tests/errmsgs/undeclared_routine5.nim
@@ -1,7 +1,7 @@
 discard """
 cmd: '''nim c --hints:off $file'''
 errormsg: "undeclared identifier: 'myfun'"
-nimout: '''undeclared_routime5.nim(9, 9) Error: undeclared identifier: 'myfun'
+nimout: '''undeclared_routine5.nim(9, 9) Error: undeclared identifier: 'myfun'
 '''
 """
 
diff --git a/tests/errmsgs/undeclared_routime_compiles.nim b/tests/errmsgs/undeclared_routine_compiles.nim
similarity index 100%
rename from tests/errmsgs/undeclared_routime_compiles.nim
rename to tests/errmsgs/undeclared_routine_compiles.nim