Fix spec names so they are more englishish