switch to by-name partitions

Change-Id: Icb09850dededed4f1abf300c179a91887518ae00