Rename to simplify spec names