Fixed <+FILENAME+> and <+FILENAME_MANGLED+> cpp templates