Renamed some merged class files to prevent possible conflicts in the future.