Fixed enum namespacing errors