Upgrading the object names to be more explicit.