Renamed files to follow ruby convention