INT-3341: fix some format and name issue