Updating some data-definition references.
Defdata is its replacement