Adding proper names to technology classes.
Refactoring CLI