Updated variable / argument names to be more pythonic.