Cleanup, simpler name

Hopefully this helps.