minor cleanup

renaming files for consistency