menu_tree_output isn't changing theme function names from dashes to underscores

In menu_tree_output the #theme attribute is left with dashes in it. So it is trying to use menu_link__main-menu instead of menu_link__main_menu.

A few lines down for menu_tree__ the dashes are replaced by underscores.