refactored sp names for clarity