Update to match new naming standard

Change-Id: I3b8f7d78be6bebe780f5632914d3149f1d68787e