core: rename a couple of variables more conventionally