Follow exact naming conventions for the reserved fields
to be consistent with other images.

Change-Id: I5aef14ca34883de12cd734c18fdb15317461b535