Modify keys in aux schema, for clarity of requirements