renaming classes to be more python-like