Conform variable names to py convention