back to g2 naming

Change-Id: I8b000d7fd95c27a2461db434ca2b2f5c3e75c04c