Revert "Revert "Updated SchemaNodeIdentifier namespace handling.""