diff --git a/lib/chef-cli/command/base.rb b/lib/chef-cli/command/base.rb
index e3ccfd28a..6252c279c 100644
--- a/lib/chef-cli/command/base.rb
+++ b/lib/chef-cli/command/base.rb
@@ -92,7 +92,7 @@ def needs_version?(params)
 
       def check_license_acceptance
         # TODO - is this the right version?
-        LicenseAcceptance::Acceptor.check_and_persist!("chef-workstation", ChefCLI::VERSION.to_s)
+        LicenseAcceptance::Acceptor.check_and_persist!("cinc-workstation", ChefCLI::VERSION.to_s)
       end
 
     end
diff --git a/lib/chef-cli/command/export.rb b/lib/chef-cli/command/export.rb
index aa3ee4625..933f6885a 100644
--- a/lib/chef-cli/command/export.rb
+++ b/lib/chef-cli/command/export.rb
@@ -33,7 +33,7 @@ class Export < Base
 
         `#{ChefCLI::Dist::EXEC} export` creates a #{ChefCLI::Dist::ZERO_PRODUCT} compatible #{ChefCLI::Dist::INFRA_PRODUCT} repository containing the
         cookbooks described in a Policyfile.lock.json. The exported repository also contains
-        a .chef/config.rb which configures #{ChefCLI::Dist::INFRA_CLIENT_PRODUCT} to apply your policy. Once the
+        a .cinc/config.rb which configures #{ChefCLI::Dist::INFRA_CLIENT_PRODUCT} to apply your policy. Once the
         exported repo is copied to the target machine, you can apply the policy to the
         machine with:
 
diff --git a/lib/chef-cli/policyfile_services/export_repo.rb b/lib/chef-cli/policyfile_services/export_repo.rb
index 70ff6955e..8859cb690 100644
--- a/lib/chef-cli/policyfile_services/export_repo.rb
+++ b/lib/chef-cli/policyfile_services/export_repo.rb
@@ -377,7 +377,7 @@ def policy_groups_dir
       end
 
       def dot_chef_dir
-        File.join(export_dir, ".chef")
+        File.join(export_dir, ".cinc")
       end
 
       def policyfile_repo_item_path
@@ -390,7 +390,7 @@ def policy_group_repo_item_path
       end
 
       def dot_chef_staging_dir
-        File.join(staging_dir, ".chef")
+        File.join(staging_dir, ".cinc")
       end
 
       def cookbook_artifacts_staging_dir
diff --git a/lib/chef-cli/skeletons/code_generator/templates/default/repo/gitignore.erb b/lib/chef-cli/skeletons/code_generator/templates/default/repo/gitignore.erb
index fcf147d5d..158b05f3c 100644
--- a/lib/chef-cli/skeletons/code_generator/templates/default/repo/gitignore.erb
+++ b/lib/chef-cli/skeletons/code_generator/templates/default/repo/gitignore.erb
@@ -12,6 +12,9 @@
 .chef
 .chef/*.pem
 .chef/encrypted_data_bag_secret
+.cinc
+.cinc/*.pem
+.cinc/encrypted_data_bag_secret
 <%- if policy_only -%>
 cookbooks/**
 !cookbooks/README.md