Yeah, it's confusing. And some damage is already done. 

I noticed that there is a small amount tests that use `eq_` and `ok_` which isn't great but it's not a huge problem. The big problems are with files that mix things. And worst of all is the `... import *` pattern which we should hunt down and kill violently.