Refactor base.py view
Refactor base.py view
Forgot these renames