Renaming nib files, and a small code fix