fix: replace partition key representations consistently

fix: replace partition key representations consistently #1039