Made name stuff work for teacher