Rename files, minor tweaks