Switched UnitSphere and UnitSquare to vars from string lookups.