Adjust to enum namespacing change