(slightly) Decrease naming fuckery