Code cleaning
Adds dynamic function naming in project file