Names refactoring
Merge branch 'master' of https://github.com/order12a/ITCentre
Parsing almost done