Rename display types back to their original format and update models.py to include table