Update spec from old format
Make private method have more idiomatic name