renamed ConventionBasedWhen -> ConventionalWhen