Improve spec naming