rename
Merge remote-tracking branch 'upstream/master'
Merge pull request #558 from patriot1burke/master

rename classes