Edit to naming conventions to reflect move to camelCase vs. underscore_based object, function and instances.