Fix for change to enum namespaces

Rust enums are now namespaced, this commit updates the codebase to reflect this.