diff --git a/lib/puppet/application/string.rb b/lib/puppet/application/faces.rb
similarity index 100%
rename from lib/puppet/application/string.rb
rename to lib/puppet/application/faces.rb
diff --git a/lib/puppet/application/string_base.rb b/lib/puppet/application/faces_base.rb
similarity index 100%
rename from lib/puppet/application/string_base.rb
rename to lib/puppet/application/faces_base.rb
diff --git a/lib/puppet/string.rb b/lib/puppet/faces.rb
similarity index 100%
rename from lib/puppet/string.rb
rename to lib/puppet/faces.rb
diff --git a/lib/puppet/string/action.rb b/lib/puppet/faces/action.rb
similarity index 100%
rename from lib/puppet/string/action.rb
rename to lib/puppet/faces/action.rb
diff --git a/lib/puppet/string/action_builder.rb b/lib/puppet/faces/action_builder.rb
similarity index 100%
rename from lib/puppet/string/action_builder.rb
rename to lib/puppet/faces/action_builder.rb
diff --git a/lib/puppet/string/action_manager.rb b/lib/puppet/faces/action_manager.rb
similarity index 100%
rename from lib/puppet/string/action_manager.rb
rename to lib/puppet/faces/action_manager.rb
diff --git a/lib/puppet/string/catalog.rb b/lib/puppet/faces/catalog.rb
similarity index 100%
rename from lib/puppet/string/catalog.rb
rename to lib/puppet/faces/catalog.rb
diff --git a/lib/puppet/string/catalog/select.rb b/lib/puppet/faces/catalog/select.rb
similarity index 100%
rename from lib/puppet/string/catalog/select.rb
rename to lib/puppet/faces/catalog/select.rb
diff --git a/lib/puppet/string/certificate.rb b/lib/puppet/faces/certificate.rb
similarity index 100%
rename from lib/puppet/string/certificate.rb
rename to lib/puppet/faces/certificate.rb
diff --git a/lib/puppet/string/certificate_request.rb b/lib/puppet/faces/certificate_request.rb
similarity index 100%
rename from lib/puppet/string/certificate_request.rb
rename to lib/puppet/faces/certificate_request.rb
diff --git a/lib/puppet/string/certificate_revocation_list.rb b/lib/puppet/faces/certificate_revocation_list.rb
similarity index 100%
rename from lib/puppet/string/certificate_revocation_list.rb
rename to lib/puppet/faces/certificate_revocation_list.rb
diff --git a/lib/puppet/string/config.rb b/lib/puppet/faces/config.rb
similarity index 100%
rename from lib/puppet/string/config.rb
rename to lib/puppet/faces/config.rb
diff --git a/lib/puppet/string/configurer.rb b/lib/puppet/faces/configurer.rb
similarity index 100%
rename from lib/puppet/string/configurer.rb
rename to lib/puppet/faces/configurer.rb
diff --git a/lib/puppet/string/string_collection.rb b/lib/puppet/faces/faces_collection.rb
similarity index 100%
rename from lib/puppet/string/string_collection.rb
rename to lib/puppet/faces/faces_collection.rb
diff --git a/lib/puppet/string/facts.rb b/lib/puppet/faces/facts.rb
similarity index 100%
rename from lib/puppet/string/facts.rb
rename to lib/puppet/faces/facts.rb
diff --git a/lib/puppet/string/file.rb b/lib/puppet/faces/file.rb
similarity index 100%
rename from lib/puppet/string/file.rb
rename to lib/puppet/faces/file.rb
diff --git a/lib/puppet/string/indirector.rb b/lib/puppet/faces/indirector.rb
similarity index 100%
rename from lib/puppet/string/indirector.rb
rename to lib/puppet/faces/indirector.rb
diff --git a/lib/puppet/string/key.rb b/lib/puppet/faces/key.rb
similarity index 100%
rename from lib/puppet/string/key.rb
rename to lib/puppet/faces/key.rb
diff --git a/lib/puppet/string/node.rb b/lib/puppet/faces/node.rb
similarity index 100%
rename from lib/puppet/string/node.rb
rename to lib/puppet/faces/node.rb
diff --git a/lib/puppet/string/option.rb b/lib/puppet/faces/option.rb
similarity index 100%
rename from lib/puppet/string/option.rb
rename to lib/puppet/faces/option.rb
diff --git a/lib/puppet/string/option_builder.rb b/lib/puppet/faces/option_builder.rb
similarity index 100%
rename from lib/puppet/string/option_builder.rb
rename to lib/puppet/faces/option_builder.rb
diff --git a/lib/puppet/string/option_manager.rb b/lib/puppet/faces/option_manager.rb
similarity index 100%
rename from lib/puppet/string/option_manager.rb
rename to lib/puppet/faces/option_manager.rb
diff --git a/lib/puppet/string/report.rb b/lib/puppet/faces/report.rb
similarity index 100%
rename from lib/puppet/string/report.rb
rename to lib/puppet/faces/report.rb
diff --git a/lib/puppet/string/resource.rb b/lib/puppet/faces/resource.rb
similarity index 100%
rename from lib/puppet/string/resource.rb
rename to lib/puppet/faces/resource.rb
diff --git a/lib/puppet/string/resource_type.rb b/lib/puppet/faces/resource_type.rb
similarity index 100%
rename from lib/puppet/string/resource_type.rb
rename to lib/puppet/faces/resource_type.rb
diff --git a/lib/puppet/string/status.rb b/lib/puppet/faces/status.rb
similarity index 100%
rename from lib/puppet/string/status.rb
rename to lib/puppet/faces/status.rb
diff --git a/spec/unit/application/string_base_spec.rb b/spec/unit/application/faces_base_spec.rb
similarity index 100%
rename from spec/unit/application/string_base_spec.rb
rename to spec/unit/application/faces_base_spec.rb
diff --git a/spec/unit/application/string_spec.rb b/spec/unit/application/faces_spec.rb
similarity index 100%
rename from spec/unit/application/string_spec.rb
rename to spec/unit/application/faces_spec.rb
diff --git a/spec/unit/string/action_builder_spec.rb b/spec/unit/faces/action_builder_spec.rb
similarity index 100%
rename from spec/unit/string/action_builder_spec.rb
rename to spec/unit/faces/action_builder_spec.rb
diff --git a/spec/unit/string/action_manager_spec.rb b/spec/unit/faces/action_manager_spec.rb
similarity index 100%
rename from spec/unit/string/action_manager_spec.rb
rename to spec/unit/faces/action_manager_spec.rb
diff --git a/spec/unit/string/action_spec.rb b/spec/unit/faces/action_spec.rb
similarity index 100%
rename from spec/unit/string/action_spec.rb
rename to spec/unit/faces/action_spec.rb
diff --git a/spec/unit/string/catalog_spec.rb b/spec/unit/faces/catalog_spec.rb
similarity index 100%
rename from spec/unit/string/catalog_spec.rb
rename to spec/unit/faces/catalog_spec.rb
diff --git a/spec/unit/string/certificate_request_spec.rb b/spec/unit/faces/certificate_request_spec.rb
similarity index 100%
rename from spec/unit/string/certificate_request_spec.rb
rename to spec/unit/faces/certificate_request_spec.rb
diff --git a/spec/unit/string/certificate_revocation_list_spec.rb b/spec/unit/faces/certificate_revocation_list_spec.rb
similarity index 100%
rename from spec/unit/string/certificate_revocation_list_spec.rb
rename to spec/unit/faces/certificate_revocation_list_spec.rb
diff --git a/spec/unit/string/certificate_spec.rb b/spec/unit/faces/certificate_spec.rb
similarity index 100%
rename from spec/unit/string/certificate_spec.rb
rename to spec/unit/faces/certificate_spec.rb
diff --git a/spec/unit/string/config_spec.rb b/spec/unit/faces/config_spec.rb
similarity index 100%
rename from spec/unit/string/config_spec.rb
rename to spec/unit/faces/config_spec.rb
diff --git a/spec/unit/string/configurer_spec.rb b/spec/unit/faces/configurer_spec.rb
similarity index 100%
rename from spec/unit/string/configurer_spec.rb
rename to spec/unit/faces/configurer_spec.rb
diff --git a/spec/unit/string/string_collection_spec.rb b/spec/unit/faces/faces_collection_spec.rb
similarity index 100%
rename from spec/unit/string/string_collection_spec.rb
rename to spec/unit/faces/faces_collection_spec.rb
diff --git a/spec/unit/string/facts_spec.rb b/spec/unit/faces/facts_spec.rb
similarity index 100%
rename from spec/unit/string/facts_spec.rb
rename to spec/unit/faces/facts_spec.rb
diff --git a/spec/unit/string/file_spec.rb b/spec/unit/faces/file_spec.rb
similarity index 100%
rename from spec/unit/string/file_spec.rb
rename to spec/unit/faces/file_spec.rb
diff --git a/spec/unit/string/indirector_spec.rb b/spec/unit/faces/indirector_spec.rb
similarity index 100%
rename from spec/unit/string/indirector_spec.rb
rename to spec/unit/faces/indirector_spec.rb
diff --git a/spec/unit/string/key_spec.rb b/spec/unit/faces/key_spec.rb
similarity index 100%
rename from spec/unit/string/key_spec.rb
rename to spec/unit/faces/key_spec.rb
diff --git a/spec/unit/string/node_spec.rb b/spec/unit/faces/node_spec.rb
similarity index 100%
rename from spec/unit/string/node_spec.rb
rename to spec/unit/faces/node_spec.rb
diff --git a/spec/unit/string/option_builder_spec.rb b/spec/unit/faces/option_builder_spec.rb
similarity index 100%
rename from spec/unit/string/option_builder_spec.rb
rename to spec/unit/faces/option_builder_spec.rb
diff --git a/spec/unit/string/option_spec.rb b/spec/unit/faces/option_spec.rb
similarity index 100%
rename from spec/unit/string/option_spec.rb
rename to spec/unit/faces/option_spec.rb
diff --git a/spec/unit/string/report_spec.rb b/spec/unit/faces/report_spec.rb
similarity index 100%
rename from spec/unit/string/report_spec.rb
rename to spec/unit/faces/report_spec.rb
diff --git a/spec/unit/string/resource_spec.rb b/spec/unit/faces/resource_spec.rb
similarity index 100%
rename from spec/unit/string/resource_spec.rb
rename to spec/unit/faces/resource_spec.rb
diff --git a/spec/unit/string/resource_type_spec.rb b/spec/unit/faces/resource_type_spec.rb
similarity index 100%
rename from spec/unit/string/resource_type_spec.rb
rename to spec/unit/faces/resource_type_spec.rb
diff --git a/spec/unit/string_spec.rb b/spec/unit/faces_spec.rb
similarity index 100%
rename from spec/unit/string_spec.rb
rename to spec/unit/faces_spec.rb