Naming fixes to teh spinner