UI-3327 Remove old variables, optimize the name variable and creat variable for Header Toolbar