Change parameter key names

reviewer: @tkawachi