Fixes refactoring inssues and typenames in visitors

Issue: #32