Updating to reflect C++ identity.