Renamed files according to style guide