DDF-593: Updated missing name changes, etc.