This naming issue has been present since PR 3529, but at least I cannot find any issues/bugs that seem to have been caused by it, which is good. The patch also removes an unnecessary `else` branch, since an already existing `break` means that it's redundant. Fixes 7232.