Updated existing objects to use new naming conventions/methodologies
Merge branch 'master' of github.com:CybOXProject/python-cybox