remove some differences between template project variable naming, rename some gap references
Merge pull request #15 from purplecabbage/CB2821

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