Patches for fixing problem with ${project_name} substitution