Renamed mods to support Solder