Renaming HS files for consistency