clean-names="yes" turns on json-invalid-name-avoidance code
clean-names="yes" turns on json-invalid-name-avoidance code
clean-names="yes" turns on json-invalid-name-avoidance code
undo dependency fix