Replace confusing 'object' term with 'shape'.