use different names for inherited objects in token spec, token class eql fix