diff --git a/SConstruct b/SConstruct
index f9948bc5a..f36262a15 100644
--- a/SConstruct
+++ b/SConstruct
@@ -2012,9 +2012,9 @@ if env["clib_legacy"]:
     install(env.RecursiveInstall, '$inst_sampledir/clib_legacy',
             'samples/clib_legacy', exclude=sampledir_excludes)
 else:
-    SConscript("build/samples/clib_generated/SConscript")
+    SConscript("build/samples/clib/SConscript")
     install(env.RecursiveInstall, "$inst_sampledir/clib",
-            "samples/clib_generated", exclude=sampledir_excludes)
+            "samples/clib", exclude=sampledir_excludes)
 
 if env['f90_interface'] == 'y':
     SConscript('build/samples/f77/SConscript')
diff --git a/doc/SConscript b/doc/SConscript
index 8468eaf07..613b55dec 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -103,8 +103,8 @@ if localenv['sphinx_docs']:
                                      clib_file, Copy("$TARGET", "$SOURCE")))
 
     # Gather clib_generated sample files
-    clib_files = Glob("#samples/clib_generated/*.c")
-    clib_files.append(File("#samples/clib_generated/README.rst"))
+    clib_files = Glob("#samples/clib/*.c")
+    clib_files.append(File("#samples/clib/README.rst"))
     for clib3_file in clib_files:
         env.Depends(sphinxdocs,
                     localenv.Command(
diff --git a/samples/clib_generated/CMakeLists.txt.in b/samples/clib/CMakeLists.txt.in
similarity index 100%
rename from samples/clib_generated/CMakeLists.txt.in
rename to samples/clib/CMakeLists.txt.in
diff --git a/samples/clib_generated/README.rst b/samples/clib/README.rst
similarity index 100%
rename from samples/clib_generated/README.rst
rename to samples/clib/README.rst
diff --git a/samples/clib_generated/SConscript b/samples/clib/SConscript
similarity index 100%
rename from samples/clib_generated/SConscript
rename to samples/clib/SConscript
diff --git a/samples/clib_generated/SConstruct.in b/samples/clib/SConstruct.in
similarity index 100%
rename from samples/clib_generated/SConstruct.in
rename to samples/clib/SConstruct.in
diff --git a/samples/clib_generated/demo.c b/samples/clib/demo.c
similarity index 100%
rename from samples/clib_generated/demo.c
rename to samples/clib/demo.c
diff --git a/test_problems/SConscript b/test_problems/SConscript
index da2dcc8d2..0efb665e6 100644
--- a/test_problems/SConscript
+++ b/test_problems/SConscript
@@ -249,7 +249,7 @@ if env["clib_legacy"]:
          '#build/samples/clib_legacy/demo', 'clib_demo_blessed.txt')
 else:
     Test('clib-demo', 'clib',
-         '#build/samples/clib_generated/demo', 'clib_demo_blessed.txt')
+         '#build/samples/clib/demo', 'clib_demo_blessed.txt')
 
 # C++ programs from User Guide
 Test('cxx-guide-demo1a', 'cxx_userguide', '#build/samples/userguide/demo1a',