diff --git a/library/phx/resources/generators/generic_material_generator.cpp b/library/phx/resources/generators/material_generator.cpp
similarity index 93%
rename from library/phx/resources/generators/generic_material_generator.cpp
rename to library/phx/resources/generators/material_generator.cpp
index 54d3ce2a7e3304c4c528a0c88d54ed368975068f..2363f1ec3e4e17be99ec31526c6e18f2556ebf2e 100644
--- a/library/phx/resources/generators/generic_material_generator.cpp
+++ b/library/phx/resources/generators/material_generator.cpp
@@ -20,7 +20,7 @@
 // limitations under the License.
 //------------------------------------------------------------------------------
 
-#include "phx/resources/generators/generic_material_generator.hpp"
+#include "phx/resources/generators/material_generator.hpp"
 
 #include <memory>
 #include <vector>
@@ -28,7 +28,7 @@
 #include "phx/resources/types/material.hpp"
 
 namespace phx {
-std::unique_ptr<Resource> GenericMaterialGenerator::Load(
+std::unique_ptr<Resource> MaterialGenerator::Load(
     const ResourceDeclaration& declaration) {
   auto resource = std::make_unique<phx::Material>();
 
diff --git a/library/phx/resources/generators/generic_material_generator.hpp b/library/phx/resources/generators/material_generator.hpp
similarity index 64%
rename from library/phx/resources/generators/generic_material_generator.hpp
rename to library/phx/resources/generators/material_generator.hpp
index bee8d9cf924b161ce4c13b3936b337a92ad8e914..267c8824d9125587e5dfcd4ed0653821aaf94eb2 100644
--- a/library/phx/resources/generators/generic_material_generator.hpp
+++ b/library/phx/resources/generators/material_generator.hpp
@@ -20,28 +20,27 @@
 // limitations under the License.
 //------------------------------------------------------------------------------
 
-#ifndef LIBRARY_PHX_RESOURCES_GENERATORS_GENERIC_MATERIAL_GENERATOR_HPP_
-#define LIBRARY_PHX_RESOURCES_GENERATORS_GENERIC_MATERIAL_GENERATOR_HPP_
+#ifndef LIBRARY_PHX_RESOURCES_GENERATORS_MATERIAL_GENERATOR_HPP_
+#define LIBRARY_PHX_RESOURCES_GENERATORS_MATERIAL_GENERATOR_HPP_
 
 #include <memory>
 
 #include "phx/resources/resource_load_strategy.hpp"
 
 namespace phx {
-class GenericMaterialGenerator final : public ResourceLoadStrategy {
+class MaterialGenerator final : public ResourceLoadStrategy {
  public:
-  GenericMaterialGenerator() = default;
-  GenericMaterialGenerator(const GenericMaterialGenerator &) = delete;
-  GenericMaterialGenerator(GenericMaterialGenerator &&) = delete;
-  ~GenericMaterialGenerator() = default;
+  MaterialGenerator() = default;
+  MaterialGenerator(const MaterialGenerator &) = delete;
+  MaterialGenerator(MaterialGenerator &&) = delete;
+  ~MaterialGenerator() = default;
 
-  GenericMaterialGenerator &operator=(const GenericMaterialGenerator &) =
-      delete;
-  GenericMaterialGenerator &operator=(GenericMaterialGenerator &&) = delete;
+  MaterialGenerator &operator=(const MaterialGenerator &) = delete;
+  MaterialGenerator &operator=(MaterialGenerator &&) = delete;
 
   std::unique_ptr<Resource> Load(
       const ResourceDeclaration &declaration) override;
 };
 }  // namespace phx
 
-#endif  // LIBRARY_PHX_RESOURCES_GENERATORS_GENERIC_MATERIAL_GENERATOR_HPP_
+#endif  // LIBRARY_PHX_RESOURCES_GENERATORS_MATERIAL_GENERATOR_HPP_
diff --git a/library/phx/resources/resource_manager.cpp b/library/phx/resources/resource_manager.cpp
index 7dd10bde3b0f01fdca309295952d7460f9d22e27..bacb1d188f1fb96ca55ded5512345295e9a06b31 100644
--- a/library/phx/resources/resource_manager.cpp
+++ b/library/phx/resources/resource_manager.cpp
@@ -96,7 +96,7 @@ void ResourceManager::RegisterImageResourceExtensions() {
 
 void ResourceManager::RegisterResourceGenerators() {
   this->RegisterResourceType("GEN_MATERIAL",
-                             std::make_unique<GenericMaterialGenerator>());
+                             std::make_unique<MaterialGenerator>());
 }
 
 }  // namespace phx
diff --git a/tests/src/test_generic_material_generator.cpp b/tests/src/test_generic_material_generator.cpp
index 811997e108a11967e49e2787d21536c6557f80cb..d26fa874c578ff318fb10d539af6182eacbf84e7 100644
--- a/tests/src/test_generic_material_generator.cpp
+++ b/tests/src/test_generic_material_generator.cpp
@@ -28,7 +28,7 @@
 #include "test_utilities/glm_vec.hpp"
 
 SCENARIO("The Generic Material Loader can create Generic materials.",
-         "[phx][phx::GenericMaterialGenerator]") {
+         "[phx][phx::MaterialGenerator]") {
   GIVEN("A plain Generic Material Generator") {
     WHEN("We load a red material") {
       auto materialResource = phx::ResourceUtils::LoadGenericMaterial(