Likely there are other functions that should be renamed, but this is a
start.