more name derp fixes