Remove long form names