Using volume name property instead of using template and id.

Change-Id: I478f875ed509fb591799a78b7fd52bc830e6fd1c
Merge "Using volume name property instead of using template and id."