Rename namespace and file names