Fix conflict with C++ keyword "namespace"
Fix wrong field name