Fixes some small errors in the GPO's API and storage layout that did not
conform to the standards for how we are ugprading the L2 system.
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>