Fixing the issue with metadata name and control name ambiguity
Fixing the issue with metadata name and control name ambiguity