Fixed minor bug in NameOf