Some more restructuring and renaming in TechnologyManager