Renamed files to use a consistent naming scheme