Update spec names to not refer to specifics

This way we can change the data in the specs without changing the names.