Changed names to conform to spec