Removes normalize
Change file names