(ref) global renaming and other refactorings as in google python styleguide