Fix issue with name in metadata

Change-Id: I841f75ec21365d8aec73b789c83a33d242b84850