Re-add object names removed in 6de38eac29563ffce75ad250029d