Fixing Teacher dict names

Fixing Teacher dict names to include underscores as in the other
variables names.