CYB-85 spec cleanup for service renaming.