Switch order of terms to reflect standard