Implemented NameExpression correctly