diff --git a/Resources/Prototypes/Entities/Clothing/Belt/base.yml b/Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/Belt/base.yml
rename to Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/base.yml b/Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/Eyes/base.yml
rename to Resources/Prototypes/Entities/Clothing/Eyes/base_clothingeyes.yml
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/Hands/base.yml
rename to Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml
diff --git a/Resources/Prototypes/Entities/Clothing/Head/base.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/Head/base.yml
rename to Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/base.yml b/Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/Masks/base.yml
rename to Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/base.yml b/Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/Neck/base.yml
rename to Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/OuterClothing/base.yml
rename to Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/Shoes/base.yml
rename to Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/Uniforms/base.yml
rename to Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml
diff --git a/Resources/Prototypes/Entities/Clothing/clothing_base.yml b/Resources/Prototypes/Entities/Clothing/base_clothing.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Clothing/clothing_base.yml
rename to Resources/Prototypes/Entities/Clothing/base_clothing.yml
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base.yml
rename to Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base_smokeables.yml
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base.yml
rename to Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/base_machineboard.yml
diff --git a/Resources/Prototypes/Entities/Objects/base.yml b/Resources/Prototypes/Entities/Objects/base_item.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Objects/base.yml
rename to Resources/Prototypes/Entities/Objects/base_item.yml
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Dispensers/base.yml
rename to Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Doors/Airlocks/base.yml
rename to Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Doors/Windoors/base.yml
rename to Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Furniture/Tables/base.yml
rename to Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Machines/Computers/base.yml
rename to Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
diff --git a/Resources/Prototypes/Entities/Structures/Machines/base.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Machines/base.yml
rename to Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Power/Generation/PA/base.yml
rename to Resources/Prototypes/Entities/Structures/Power/Generation/PA/base_particleaccelerator.yml
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Storage/Closets/base.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Storage/Crates/base.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Storage/Tanks/base.yml
rename to Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base.yml
rename to Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
diff --git a/Resources/Prototypes/Entities/Structures/Walls/base.yml b/Resources/Prototypes/Entities/Structures/Walls/base_structurewalls.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/Walls/base.yml
rename to Resources/Prototypes/Entities/Structures/Walls/base_structurewalls.yml
diff --git a/Resources/Prototypes/Entities/Structures/base.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml
similarity index 100%
rename from Resources/Prototypes/Entities/Structures/base.yml
rename to Resources/Prototypes/Entities/Structures/base_structure.yml