Renamed a file plus some tweaks.