Changing names to be more modern Python.