diff --git a/TestModels/Aggregate/Makefile b/TestModels/Aggregate/Makefile
index 48a8fb216..aa33b8e69 100644
--- a/TestModels/Aggregate/Makefile
+++ b/TestModels/Aggregate/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.aggregate
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_aggregate
 
 # This project has no dependencies 
diff --git a/TestModels/Constraints/Makefile b/TestModels/Constraints/Makefile
index fe6e07734..efe543d4e 100644
--- a/TestModels/Constraints/Makefile
+++ b/TestModels/Constraints/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.constraints
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_constraints
 
 # This project has no dependencies 
diff --git a/TestModels/Constructor/Makefile b/TestModels/Constructor/Makefile
index 36d7a8305..7b4d2102e 100644
--- a/TestModels/Constructor/Makefile
+++ b/TestModels/Constructor/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.constructor
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_constructor
 
 # This project has no dependencies
diff --git a/TestModels/Dependencies/Makefile b/TestModels/Dependencies/Makefile
index 402a4c1aa..c31a64637 100644
--- a/TestModels/Dependencies/Makefile
+++ b/TestModels/Dependencies/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.dependencies
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_dependencies
 
 # This project takes dependencies on:
diff --git a/TestModels/Errors/Makefile b/TestModels/Errors/Makefile
index d9b92ce71..51d586bef 100644
--- a/TestModels/Errors/Makefile
+++ b/TestModels/Errors/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.errors
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_errors
 
 # This project has no dependencies 
diff --git a/TestModels/Extendable/Makefile b/TestModels/Extendable/Makefile
index bf8c9988f..d4b2f7940 100644
--- a/TestModels/Extendable/Makefile
+++ b/TestModels/Extendable/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.extendable.resources
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_extendable_resources
 
 # This project has no dependencies 
diff --git a/TestModels/Extern/Makefile b/TestModels/Extern/Makefile
index ded1dd1cd..55ecb1ac3 100644
--- a/TestModels/Extern/Makefile
+++ b/TestModels/Extern/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.dafnyExtern
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_dafnyextern
 
 # This project has no dependencies 
diff --git a/TestModels/LocalService/Makefile b/TestModels/LocalService/Makefile
index badb14a51..64efe0d25 100644
--- a/TestModels/LocalService/Makefile
+++ b/TestModels/LocalService/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.localService
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_localservice
 
 # This project has no dependencies 
diff --git a/TestModels/Refinement/Makefile b/TestModels/Refinement/Makefile
index b4f2a7236..02934e7cc 100644
--- a/TestModels/Refinement/Makefile
+++ b/TestModels/Refinement/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.refinement
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_refinement
 
 # This project has no dependencies 
diff --git a/TestModels/Resource/Makefile b/TestModels/Resource/Makefile
index ff562b474..8e7804040 100644
--- a/TestModels/Resource/Makefile
+++ b/TestModels/Resource/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.resources
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_resources
 
 # This project has no dependencies 
diff --git a/TestModels/SimpleTypes/SimpleBlob/Makefile b/TestModels/SimpleTypes/SimpleBlob/Makefile
index 6e4f2153f..53ef80fdf 100644
--- a/TestModels/SimpleTypes/SimpleBlob/Makefile
+++ b/TestModels/SimpleTypes/SimpleBlob/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.blob
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_types_blob
 
 # This project has no dependencies 
diff --git a/TestModels/SimpleTypes/SimpleBoolean/Makefile b/TestModels/SimpleTypes/SimpleBoolean/Makefile
index 8ec61c383..fe45a3a5e 100644
--- a/TestModels/SimpleTypes/SimpleBoolean/Makefile
+++ b/TestModels/SimpleTypes/SimpleBoolean/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.boolean
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_types_boolean
 
 # This project has no dependencies 
diff --git a/TestModels/SimpleTypes/SimpleDouble/Makefile b/TestModels/SimpleTypes/SimpleDouble/Makefile
index 5e561b931..c44ba5f94 100644
--- a/TestModels/SimpleTypes/SimpleDouble/Makefile
+++ b/TestModels/SimpleTypes/SimpleDouble/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.smithyDouble
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_types_smithydouble
 
 # This project has no dependencies 
diff --git a/TestModels/SimpleTypes/SimpleEnum/Makefile b/TestModels/SimpleTypes/SimpleEnum/Makefile
index 55767b031..037cb878d 100644
--- a/TestModels/SimpleTypes/SimpleEnum/Makefile
+++ b/TestModels/SimpleTypes/SimpleEnum/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.smithyEnum
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_types_smithyenum
 
 # This project has no dependencies 
diff --git a/TestModels/SimpleTypes/SimpleInteger/Makefile b/TestModels/SimpleTypes/SimpleInteger/Makefile
index 083d0789a..5398ef9bc 100644
--- a/TestModels/SimpleTypes/SimpleInteger/Makefile
+++ b/TestModels/SimpleTypes/SimpleInteger/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.integer
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_types_integer
 
 # This project has no dependencies
diff --git a/TestModels/SimpleTypes/SimpleLong/Makefile b/TestModels/SimpleTypes/SimpleLong/Makefile
index 730b4da80..ead474033 100644
--- a/TestModels/SimpleTypes/SimpleLong/Makefile
+++ b/TestModels/SimpleTypes/SimpleLong/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.smithyLong
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_types_smithylong
 
 # This project has no dependencies 
diff --git a/TestModels/SimpleTypes/SimpleString/Makefile b/TestModels/SimpleTypes/SimpleString/Makefile
index a3427b4a0..79c2acff1 100644
--- a/TestModels/SimpleTypes/SimpleString/Makefile
+++ b/TestModels/SimpleTypes/SimpleString/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../../SharedMakefile.mk
 
 NAMESPACE=simple.types.smithyString
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_types_smithystring
 
 # This project has no dependencies 
diff --git a/TestModels/Union/Makefile b/TestModels/Union/Makefile
index 4830f2951..2d0f49de4 100644
--- a/TestModels/Union/Makefile
+++ b/TestModels/Union/Makefile
@@ -6,7 +6,7 @@ CORES=2
 include ../SharedMakefile.mk
 
 NAMESPACE=simple.union
-# TODO: Move to smithy-build.json once language-specific config is supported
+# TODO: Move to smithy-build.json once Dafny plugin supports language-specific config
 PYTHON_MODULE_NAME=simple_union
 
 # This project has no dependencies