Avoid inconsistency in lesson name lookup
Avoid unnecessary name lookup

and thus better performance (a little faster)