Cosmetics

Renamed stuff to Python naming convention