added template names and used cwd properly