rename defines that should be classes
Merge pull request #15 from jlambert121/define_rename

rename defines that should be classes