PP/2: refactor function/struct names