Moving defined names to object model