diff --git a/circle.yml b/circle.yml
index 41dd9e71d..4f6cd5790 100644
--- a/circle.yml
+++ b/circle.yml
@@ -24,10 +24,10 @@ jobs:
       - run:
           command: |
             blockstack-core local initialize db &&
-            blockstack-core local check sample-programs/tokens.clar db &&
-            blockstack-core local launch S1G2081040G2081040G2081040G208105NK8PE5.tokens sample-programs/tokens.clar db &&
-            blockstack-core local check sample-programs/names.clar db &&
-            blockstack-core local launch S1G2081040G2081040G2081040G208105NK8PE5.names sample-programs/names.clar db &&
+            blockstack-core local check sample-contracts/tokens.clar db &&
+            blockstack-core local launch S1G2081040G2081040G2081040G208105NK8PE5.tokens sample-contracts/tokens.clar db &&
+            blockstack-core local check sample-contracts/names.clar db &&
+            blockstack-core local launch S1G2081040G2081040G2081040G208105NK8PE5.names sample-contracts/names.clar db &&
             blockstack-core local execute db S1G2081040G2081040G2081040G208105NK8PE5.tokens mint! SZ2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQ9H6DPR u100000
       - run:
           command: |
diff --git a/sample-programs/names.clar b/sample-contracts/names.clar
similarity index 100%
rename from sample-programs/names.clar
rename to sample-contracts/names.clar
diff --git a/sample-programs/tokens-mint.clar b/sample-contracts/tokens-mint.clar
similarity index 100%
rename from sample-programs/tokens-mint.clar
rename to sample-contracts/tokens-mint.clar
diff --git a/sample-programs/tokens.clar b/sample-contracts/tokens.clar
similarity index 100%
rename from sample-programs/tokens.clar
rename to sample-contracts/tokens.clar
diff --git a/src/blockstack_cli.rs b/src/blockstack_cli.rs
index 5f27afe38..bd8d5192a 100644
--- a/src/blockstack_cli.rs
+++ b/src/blockstack_cli.rs
@@ -415,7 +415,7 @@ mod test {
             "1",
             "0",
             "foo-contract",
-            "./sample-programs/tokens.clar"];
+            "./sample-contracts/tokens.clar"];
 
         assert!(main_handler(to_string_vec(&publish_args)).is_ok());
 
@@ -425,7 +425,7 @@ mod test {
             "1",
             "0",
             "foo-contract",
-            "./sample-programs/non-existent-tokens.clar"];
+            "./sample-contracts/non-existent-tokens.clar"];
 
         assert!(format!("{}", main_handler(to_string_vec(&publish_args)).unwrap_err())
                 .contains("IO error"));
diff --git a/src/clarity.rs b/src/clarity.rs
index 73136bdfc..d518fe4ba 100644
--- a/src/clarity.rs
+++ b/src/clarity.rs
@@ -607,21 +607,21 @@ mod test {
         invoke_command("test", &["initialize".to_string(), db_name.clone()]);
 
         eprintln!("check tokens");
-        invoke_command("test", &["check".to_string(), "sample-programs/tokens.clar".to_string()]);
+        invoke_command("test", &["check".to_string(), "sample-contracts/tokens.clar".to_string()]);
         
         eprintln!("check tokens");
-        invoke_command("test", &["check".to_string(), "sample-programs/tokens.clar".to_string(), db_name.clone()]);
+        invoke_command("test", &["check".to_string(), "sample-contracts/tokens.clar".to_string(), db_name.clone()]);
         
         eprintln!("launch tokens");
         invoke_command("test", &["launch".to_string(), "S1G2081040G2081040G2081040G208105NK8PE5.tokens".to_string(),
-                                 "sample-programs/tokens.clar".to_string(), db_name.clone()]);
+                                 "sample-contracts/tokens.clar".to_string(), db_name.clone()]);
 
         eprintln!("check names");
-        invoke_command("test", &["check".to_string(), "sample-programs/names.clar".to_string(), db_name.clone()]);
+        invoke_command("test", &["check".to_string(), "sample-contracts/names.clar".to_string(), db_name.clone()]);
 
         eprintln!("launch names");
         invoke_command("test", &["launch".to_string(), "S1G2081040G2081040G2081040G208105NK8PE5.names".to_string(),
-                                 "sample-programs/names.clar".to_string(), db_name.clone()]);
+                                 "sample-contracts/names.clar".to_string(), db_name.clone()]);
 
         eprintln!("execute tokens");
         invoke_command("test", &["execute".to_string(), db_name.clone(), "S1G2081040G2081040G2081040G208105NK8PE5.tokens".to_string(),
@@ -630,13 +630,13 @@ mod test {
                             
         eprintln!("eval tokens");
         invoke_command("test", &["eval".to_string(), "S1G2081040G2081040G2081040G208105NK8PE5.tokens".to_string(), 
-                                 "sample-programs/tokens-mint.clar".to_string(),
+                                 "sample-contracts/tokens-mint.clar".to_string(),
                                  db_name.clone()
                                  ]);
 
         eprintln!("eval_at_chaintip tokens");
         invoke_command("test", &["eval_at_chaintip".to_string(), "S1G2081040G2081040G2081040G208105NK8PE5.tokens".to_string(), 
-                                 "sample-programs/tokens-mint.clar".to_string(),
+                                 "sample-contracts/tokens-mint.clar".to_string(),
                                  db_name.clone()
                                  ]);
     }