Bug with name template fixed
Requirement file fixes