More Nomenclature Work; nesting still broken