This reverts commit 595b29519ab6850811ed2e68b75e29a2240a5432. Bindings are not using the nicks but the actual enum names.