Small internal change to bucket key mapping