Rename files

Some file names didn't seem right, so I renamed them.