Moving names and terms to appropriate models