Fixed variables to python naming scheme