diff --git a/data/mods/Aftershock/items/afs_armor.json b/data/mods/Aftershock/items/armor.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_armor.json
rename to data/mods/Aftershock/items/armor.json
diff --git a/data/mods/Aftershock/items/afs_bioparts.json b/data/mods/Aftershock/items/bioparts.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_bioparts.json
rename to data/mods/Aftershock/items/bioparts.json
diff --git a/data/mods/Aftershock/items/afs_books.json b/data/mods/Aftershock/items/books.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_books.json
rename to data/mods/Aftershock/items/books.json
diff --git a/data/mods/Aftershock/items/afs_cbms.json b/data/mods/Aftershock/items/cbms.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_cbms.json
rename to data/mods/Aftershock/items/cbms.json
diff --git a/data/mods/Aftershock/items/afs_comestibles.json b/data/mods/Aftershock/items/comestibles.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_comestibles.json
rename to data/mods/Aftershock/items/comestibles.json
diff --git a/data/mods/Aftershock/items/afs_furniture.json b/data/mods/Aftershock/items/furniture.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_furniture.json
rename to data/mods/Aftershock/items/furniture.json
diff --git a/data/mods/Aftershock/items/afs_inactiverobot.json b/data/mods/Aftershock/items/inactiverobot.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_inactiverobot.json
rename to data/mods/Aftershock/items/inactiverobot.json
diff --git a/data/mods/Aftershock/items/afs_item_groups.json b/data/mods/Aftershock/items/item_groups.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_item_groups.json
rename to data/mods/Aftershock/items/item_groups.json
diff --git a/data/mods/Aftershock/items/afs_item_overrides.json b/data/mods/Aftershock/items/item_overrides.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_item_overrides.json
rename to data/mods/Aftershock/items/item_overrides.json
diff --git a/data/mods/Aftershock/items/afs__items.json b/data/mods/Aftershock/items/items.json
similarity index 100%
rename from data/mods/Aftershock/items/afs__items.json
rename to data/mods/Aftershock/items/items.json
diff --git a/data/mods/Aftershock/items/afs_materials.json b/data/mods/Aftershock/items/materials.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_materials.json
rename to data/mods/Aftershock/items/materials.json
diff --git a/data/mods/Aftershock/items/afs_tool_quality.json b/data/mods/Aftershock/items/tool_quality.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_tool_quality.json
rename to data/mods/Aftershock/items/tool_quality.json
diff --git a/data/mods/Aftershock/items/afs_tools.json b/data/mods/Aftershock/items/tools.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_tools.json
rename to data/mods/Aftershock/items/tools.json
diff --git a/data/mods/Aftershock/items/afs_weapons.json b/data/mods/Aftershock/items/weapons.json
similarity index 100%
rename from data/mods/Aftershock/items/afs_weapons.json
rename to data/mods/Aftershock/items/weapons.json
diff --git a/data/mods/Aftershock/maps/afs_furniture.json b/data/mods/Aftershock/maps/furniture.json
similarity index 100%
rename from data/mods/Aftershock/maps/afs_furniture.json
rename to data/mods/Aftershock/maps/furniture.json
diff --git a/data/mods/Aftershock/maps/afs_item_groups.json b/data/mods/Aftershock/maps/item_groups.json
similarity index 100%
rename from data/mods/Aftershock/maps/afs_item_groups.json
rename to data/mods/Aftershock/maps/item_groups.json
diff --git a/data/mods/Aftershock/maps/afs_lab_vehicle_track.json b/data/mods/Aftershock/maps/lab_vehicle_track.json
similarity index 100%
rename from data/mods/Aftershock/maps/afs_lab_vehicle_track.json
rename to data/mods/Aftershock/maps/lab_vehicle_track.json
diff --git a/data/mods/Aftershock/maps/afs_lab_weapons_range.json b/data/mods/Aftershock/maps/lab_weapons_range.json
similarity index 100%
rename from data/mods/Aftershock/maps/afs_lab_weapons_range.json
rename to data/mods/Aftershock/maps/lab_weapons_range.json
diff --git a/data/mods/Aftershock/maps/afs_overmap_specials.json b/data/mods/Aftershock/maps/overmap_specials.json
similarity index 100%
rename from data/mods/Aftershock/maps/afs_overmap_specials.json
rename to data/mods/Aftershock/maps/overmap_specials.json
diff --git a/data/mods/Aftershock/maps/afs_overmap_terrain.json b/data/mods/Aftershock/maps/overmap_terrain.json
similarity index 100%
rename from data/mods/Aftershock/maps/afs_overmap_terrain.json
rename to data/mods/Aftershock/maps/overmap_terrain.json
diff --git a/data/mods/Aftershock/maps/afs_regional_map_settings.json b/data/mods/Aftershock/maps/regional_map_settings.json
similarity index 100%
rename from data/mods/Aftershock/maps/afs_regional_map_settings.json
rename to data/mods/Aftershock/maps/regional_map_settings.json
diff --git a/data/mods/Aftershock/maps/afs_terrain.json b/data/mods/Aftershock/maps/terrain.json
similarity index 100%
rename from data/mods/Aftershock/maps/afs_terrain.json
rename to data/mods/Aftershock/maps/terrain.json
diff --git a/data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json b/data/mods/Aftershock/mobs/PrepPhyle_mobs.json
similarity index 100%
rename from data/mods/Aftershock/mobs/afs_PrepPhyle_mobs.json
rename to data/mods/Aftershock/mobs/PrepPhyle_mobs.json
diff --git a/data/mods/Aftershock/mobs/afs_harvest.json b/data/mods/Aftershock/mobs/harvest.json
similarity index 100%
rename from data/mods/Aftershock/mobs/afs_harvest.json
rename to data/mods/Aftershock/mobs/harvest.json
diff --git a/data/mods/Aftershock/mobs/afs_monster_faction.json b/data/mods/Aftershock/mobs/monster_faction.json
similarity index 100%
rename from data/mods/Aftershock/mobs/afs_monster_faction.json
rename to data/mods/Aftershock/mobs/monster_faction.json
diff --git a/data/mods/Aftershock/mobs/afs_monster_groups.json b/data/mods/Aftershock/mobs/monster_groups.json
similarity index 100%
rename from data/mods/Aftershock/mobs/afs_monster_groups.json
rename to data/mods/Aftershock/mobs/monster_groups.json
diff --git a/data/mods/Aftershock/mobs/afs_robots.json b/data/mods/Aftershock/mobs/robots.json
similarity index 100%
rename from data/mods/Aftershock/mobs/afs_robots.json
rename to data/mods/Aftershock/mobs/robots.json
diff --git a/data/mods/Aftershock/mobs/afs_zombies.json b/data/mods/Aftershock/mobs/zombies.json
similarity index 100%
rename from data/mods/Aftershock/mobs/afs_zombies.json
rename to data/mods/Aftershock/mobs/zombies.json
diff --git a/data/mods/Aftershock/mutations/afs_mutations.json b/data/mods/Aftershock/mutations/mutations.json
similarity index 100%
rename from data/mods/Aftershock/mutations/afs_mutations.json
rename to data/mods/Aftershock/mutations/mutations.json
diff --git a/data/mods/Aftershock/npcs/afs_classes.json b/data/mods/Aftershock/npcs/classes.json
similarity index 100%
rename from data/mods/Aftershock/npcs/afs_classes.json
rename to data/mods/Aftershock/npcs/classes.json
diff --git a/data/mods/Aftershock/npcs/afs_factions.json b/data/mods/Aftershock/npcs/factions.json
similarity index 100%
rename from data/mods/Aftershock/npcs/afs_factions.json
rename to data/mods/Aftershock/npcs/factions.json
diff --git a/data/mods/Aftershock/npcs/afs_npc.json b/data/mods/Aftershock/npcs/npc.json
similarity index 100%
rename from data/mods/Aftershock/npcs/afs_npc.json
rename to data/mods/Aftershock/npcs/npc.json
diff --git a/data/mods/Aftershock/npcs/afs_prepnet_dialogue.json b/data/mods/Aftershock/npcs/prepnet_dialogue.json
similarity index 100%
rename from data/mods/Aftershock/npcs/afs_prepnet_dialogue.json
rename to data/mods/Aftershock/npcs/prepnet_dialogue.json
diff --git a/data/mods/Aftershock/player/afs_bionics.json b/data/mods/Aftershock/player/bionics.json
similarity index 100%
rename from data/mods/Aftershock/player/afs_bionics.json
rename to data/mods/Aftershock/player/bionics.json
diff --git a/data/mods/Aftershock/player/afs_mutations.json b/data/mods/Aftershock/player/mutations.json
similarity index 100%
rename from data/mods/Aftershock/player/afs_mutations.json
rename to data/mods/Aftershock/player/mutations.json
diff --git a/data/mods/Aftershock/player/afs_professions.json b/data/mods/Aftershock/player/professions.json
similarity index 100%
rename from data/mods/Aftershock/player/afs_professions.json
rename to data/mods/Aftershock/player/professions.json
diff --git a/data/mods/Aftershock/player/afs_techniques.json b/data/mods/Aftershock/player/techniques.json
similarity index 100%
rename from data/mods/Aftershock/player/afs_techniques.json
rename to data/mods/Aftershock/player/techniques.json
diff --git a/data/mods/Aftershock/recipes/afs_armor_recipes.json b/data/mods/Aftershock/recipes/armor_recipes.json
similarity index 100%
rename from data/mods/Aftershock/recipes/afs_armor_recipes.json
rename to data/mods/Aftershock/recipes/armor_recipes.json
diff --git a/data/mods/Aftershock/recipes/afs_bionic_recipes.json b/data/mods/Aftershock/recipes/bionic_recipes.json
similarity index 100%
rename from data/mods/Aftershock/recipes/afs_bionic_recipes.json
rename to data/mods/Aftershock/recipes/bionic_recipes.json
diff --git a/data/mods/Aftershock/recipes/afs_comestible_recipes.json b/data/mods/Aftershock/recipes/comestible_recipes.json
similarity index 100%
rename from data/mods/Aftershock/recipes/afs_comestible_recipes.json
rename to data/mods/Aftershock/recipes/comestible_recipes.json
diff --git a/data/mods/Aftershock/recipes/afs_construction.json b/data/mods/Aftershock/recipes/construction.json
similarity index 100%
rename from data/mods/Aftershock/recipes/afs_construction.json
rename to data/mods/Aftershock/recipes/construction.json
diff --git a/data/mods/Aftershock/recipes/afs_deconstruction.json b/data/mods/Aftershock/recipes/deconstruction.json
similarity index 100%
rename from data/mods/Aftershock/recipes/afs_deconstruction.json
rename to data/mods/Aftershock/recipes/deconstruction.json
diff --git a/data/mods/Aftershock/recipes/afs_recipe_overrides.json b/data/mods/Aftershock/recipes/recipe_overrides.json
similarity index 100%
rename from data/mods/Aftershock/recipes/afs_recipe_overrides.json
rename to data/mods/Aftershock/recipes/recipe_overrides.json
diff --git a/data/mods/Aftershock/recipes/afs__recipes.json b/data/mods/Aftershock/recipes/recipes.json
similarity index 100%
rename from data/mods/Aftershock/recipes/afs__recipes.json
rename to data/mods/Aftershock/recipes/recipes.json
diff --git a/data/mods/Aftershock/recipes/afs_requirements.json b/data/mods/Aftershock/recipes/requirements.json
similarity index 100%
rename from data/mods/Aftershock/recipes/afs_requirements.json
rename to data/mods/Aftershock/recipes/requirements.json
diff --git a/data/mods/Aftershock/recipes/afs_uncraft.json b/data/mods/Aftershock/recipes/uncraft.json
similarity index 100%
rename from data/mods/Aftershock/recipes/afs_uncraft.json
rename to data/mods/Aftershock/recipes/uncraft.json
diff --git a/data/mods/Aftershock/afs_speech.json b/data/mods/Aftershock/speech.json
similarity index 100%
rename from data/mods/Aftershock/afs_speech.json
rename to data/mods/Aftershock/speech.json
diff --git a/data/mods/Aftershock/vehicles/afs_part_items.json b/data/mods/Aftershock/vehicles/part_items.json
similarity index 100%
rename from data/mods/Aftershock/vehicles/afs_part_items.json
rename to data/mods/Aftershock/vehicles/part_items.json
diff --git a/data/mods/Aftershock/vehicles/afs_vehicle_groups.json b/data/mods/Aftershock/vehicles/vehicle_groups.json
similarity index 100%
rename from data/mods/Aftershock/vehicles/afs_vehicle_groups.json
rename to data/mods/Aftershock/vehicles/vehicle_groups.json
diff --git a/data/mods/Aftershock/vehicles/afs_vehicle_overrides.json b/data/mods/Aftershock/vehicles/vehicle_overrides.json
similarity index 100%
rename from data/mods/Aftershock/vehicles/afs_vehicle_overrides.json
rename to data/mods/Aftershock/vehicles/vehicle_overrides.json
diff --git a/data/mods/Aftershock/vehicles/afs_vehicle_parts.json b/data/mods/Aftershock/vehicles/vehicle_parts.json
similarity index 100%
rename from data/mods/Aftershock/vehicles/afs_vehicle_parts.json
rename to data/mods/Aftershock/vehicles/vehicle_parts.json
diff --git a/data/mods/Aftershock/vehicles/afs_vehicles.json b/data/mods/Aftershock/vehicles/vehicles.json
similarity index 100%
rename from data/mods/Aftershock/vehicles/afs_vehicles.json
rename to data/mods/Aftershock/vehicles/vehicles.json