Continued refactoring of project. Extracted some ASTVisitors, improved
NameModel class