Clear up variable names in specs