Begin changing to SP specific verbage