Rename some stuff so we are not overloading names with python built-ins
Missed some spots