Renamed some files to prevent confusion in Eclipse.