remove some differences between template project variable naming, rename...

... some gap references