Rename macro WhenThen to Section