Renamed files and classes to match defaults