Minor documentation/spec naming changes