Merge pull request #558 from patriot1burke/master

rename classes
federation iteration 2