Rename a directory
Fix replacements in xib files
Use template format for some images