Rename a few bits n pieces + spelling of catalogue