more consistent naming convention for objects/functions