Renamed components files with underscores