Ref #8 - Manage volume name, volume type, some fix