introduce difference between cluster's id and cluster's name

basically this is the proposed change. ( 'quick' suite holds)