Shorten ChefFS repo cookbook artifacts dir name

2 files changed, 5 insertions, 3 deletions

diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb
index 1a67064a72..a0895b1213 100644
--- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb
@@ -19,7 +19,7 @@
 require "chef/chef_fs/file_system/base_fs_dir"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_acls_dir"
 require "chef/chef_fs/file_system/repository/cookbooks_dir"
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifacts_dir"
+require "chef/chef_fs/file_system/repository/cookbook_artifacts_dir"
 require "chef/chef_fs/file_system/repository/data_bags_dir"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_entry"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_policies_dir"
@@ -171,7 +171,7 @@ class Chef
                 dirs = paths.map { |path| CookbooksDir.new(name, self, path) }
               end
             when "cookbook_artifacts"
-              dirs = paths.map { |path| ChefRepositoryFileSystemCookbookArtifactsDir.new(name, self, path) }
+              dirs = paths.map { |path| CookbookArtifactsDir.new(name, self, path) }
             when "policies"
               dirs = paths.map { |path| ChefRepositoryFileSystemPoliciesDir.new(name, self, path) }
             when "data_bags"
diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifacts_dir.rb b/lib/chef/chef_fs/file_system/repository/cookbook_artifacts_dir.rb
index 47719beb50..773d9a5e5a 100644
--- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifacts_dir.rb
+++ b/lib/chef/chef_fs/file_system/repository/cookbook_artifacts_dir.rb
@@ -23,7 +23,9 @@ class Chef
   module ChefFS
     module FileSystem
       module Repository
-        class ChefRepositoryFileSystemCookbookArtifactsDir < CookbooksDir
+
+        # Represents ROOT/cookbook_artifacts
+        class CookbookArtifactsDir < CookbooksDir
           def make_child_entry(child_name)
             ChefRepositoryFileSystemCookbookArtifactDir.new(child_name, self)
           end