Berliner. Committing python variable name changes to reflect UX.