renaming files/directories for consistency