Fix up some silly naming issues