Renamed files for consistency
Fixed refactoring oops