Started renaming stuff to follow Python conventions.