Patches from Erwin for the problem with ${project_name} substitutions