update parameters name and official stats
Some minor changes in ordering