Renamed CR's files for java compatibility