File renaming and code changes