Fix metadata name collision
2 files changed