renaming some files
internal naming consistency