Fix more references to spec

review by @sjrd