More fmt_main name convention fixes