diff --git a/example/Jamfile b/example/Jamfile
index cb49f1a..71301a5 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -12,9 +12,9 @@ test-suite iterator_examples
     [ run node_iterator3.cpp ]
     [ run counting_iterator_example.cpp ]
     [ run filter_iterator_example.cpp ]
-    [ run function_output_iterator_example.cpp ]
+    [ run func_output_iter_example.cpp ]
     [ run indirect_iterator_example.cpp ]
-    [ run permutation_iterator_example.cpp ]
+    [ run permutation_iter_example.cpp ]
     [ run reverse_iterator_example.cpp ]
     [ run transform_iterator_example.cpp ]
       ;
diff --git a/example/function_output_iterator_example.cpp b/example/func_output_iter_example.cpp
similarity index 100%
rename from example/function_output_iterator_example.cpp
rename to example/func_output_iter_example.cpp
diff --git a/example/permutation_iterator_example.cpp b/example/permutation_iter_example.cpp
similarity index 100%
rename from example/permutation_iterator_example.cpp
rename to example/permutation_iter_example.cpp
diff --git a/test/Jamfile b/test/Jamfile
index a21c906..b206bde 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -36,11 +36,11 @@ test-suite iterator
     [ run iterator_adaptor_cc.cpp ]
     [ run iterator_adaptor_test.cpp ]
     [ compile iterator_archetype_cc.cpp ]
-    [ compile-fail iterator_archetype_default_ctor.cpp ]
-    [ compile-fail lvalue_concept_fail_expected.cpp ]
+    [ compile-fail iter_archetype_default_ctor.cpp ]
+    [ compile-fail lvalue_concept_fail.cpp ]
     [ run transform_iterator_test.cpp ]
     [ run indirect_iterator_test.cpp ]
-    [ compile indirect_iterator_member_types.cpp ]
+    [ compile indirect_iter_member_types.cpp ]
     [ run filter_iterator_test.cpp ]
     [ run iterator_facade.cpp ]
     [ run reverse_iterator_test.cpp ]
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index a3172f7..b8e388b 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -32,11 +32,11 @@ test-suite iterator
     [ run iterator_adaptor_cc.cpp ]
     [ run iterator_adaptor_test.cpp ]
     [ compile iterator_archetype_cc.cpp ]
-    [ compile-fail iterator_archetype_default_ctor.cpp ]
-    [ compile-fail lvalue_concept_fail_expected.cpp ]
+    [ compile-fail iter_archetype_default_ctor.cpp ]
+    [ compile-fail lvalue_concept_fail.cpp ]
     [ run transform_iterator_test.cpp ]
     [ run indirect_iterator_test.cpp ]
-    [ compile indirect_iterator_member_types.cpp ]
+    [ compile indirect_iter_member_types.cpp ]
     [ run filter_iterator_test.cpp ]
     [ run reverse_iterator_test.cpp ]
     [ run counting_iterator_test.cpp ]
diff --git a/test/indirect_iterator_member_types.cpp b/test/indirect_iter_member_types.cpp
similarity index 100%
rename from test/indirect_iterator_member_types.cpp
rename to test/indirect_iter_member_types.cpp
diff --git a/test/iterator_archetype_default_ctor.cpp b/test/iter_archetype_default_ctor.cpp
similarity index 100%
rename from test/iterator_archetype_default_ctor.cpp
rename to test/iter_archetype_default_ctor.cpp
diff --git a/test/lvalue_concept_fail_expected.cpp b/test/lvalue_concept_fail.cpp
similarity index 100%
rename from test/lvalue_concept_fail_expected.cpp
rename to test/lvalue_concept_fail.cpp