naming clean up
fixed issue with more classes in template, added the case to integration tests