Rename some functions to conform to Ring naming conventions
Convert two functions from varargs to an explicit map