CORE-24: Fix serialization of inherited types and minor variable renaming