Rename DatabaseManager.InstanceComparator to InstanceIdComparator