Renamed everything to remove the hyphen