Neither is a satisfactory term. "Undergarments" is the way to go.