Standardizes storage spacer names and makes sure that storage spacers
are all using their original variable types.
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>