Less global pollution

Renamed this file because it doesn't globalify any more.