Refactor spec names