Clarifying Gon helpers

Some renaming