Renamed some classes and mod ID