Fix bug 1023623: Add inprogress flag to stubs

Oh, instead use `names_with_underscores` instead.