pm: various name refactoring
Change two `match`es that should be `if`s