Merge "Use classname as prefix of volume name"