Minor adjustments to condition names to make them clearer