Story 48192365: updating spec and role names