Renamed JSM classes