A little renaming and tidying.
NSSecureCoding compliant.