Revert "Begin changing to SP specific verbage"

This reverts commit ebd1cbc01def2213b88ef4ca96345607e5b94153.