red-brick/pi: Improve some function names