Update Objects to final namespaces and changes.