Fixing bug on supported instance name

Change-Id: I586b7939970b6fb77862e1f67e3a18daf40e1885