update to recent rust changes: enums are namespaced now