renaming to match schema naming convention

Change-Id: I7e300960535dc985582b52c200e89c49c5d47c27