Another TODO update.
Fix this terminology.