gn2bp: name helper functions more consistently

Test: none
Change-Id: I84f14d804e206c638df4a61978601706e09c589a
1 file changed