Fix for rust commit 3dcd2157403163789aaf21a9ab3c4d30a7c6494d 'Switch to purely namespaced enums'
Renamed, undid re-exports in types, and updated references in types.
Merge pull request #60 from CraZySacX/master

Switch to purely namespaced enums (not yet builds on nightly)