These names should be better