Fix partition names to be actually used