This was a really old TODO.  It's still relevant, but it would take substantial effort (migrations, renaming, etc) to switch over to the new naming.  Best to table for now.