[dna-issues] [JBoss JIRA] Updated: (DNA-205) Rename/refactor classes