Updated core files to account for new naming conventions
Updated core files to account for new naming conventions
Merge branch 'master' of github.com:CybOXProject/python-cybox