Rename Partitions to avoid shadow