diff --git a/Core/src/org/sleuthkit/autopsy/communications/AccountsRootChildren.java b/Core/src/org/sleuthkit/autopsy/communications/AccountsRootChildren.java
index 7fe3413e2d..34762c056c 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/AccountsRootChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/AccountsRootChildren.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2017 Basis Technology Corp.
+ * Copyright 2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -84,7 +84,7 @@ class AccountsRootChildren extends ChildFactory<AccountDeviceInstanceKey> {
             this.accountDeviceInstanceKey = accountDeviceInstanceKey;
             this.commsManager = commsManager;
             this.account = accountDeviceInstanceKey.getAccountDeviceInstance().getAccount();
-            setName(account.getAccountUniqueID());
+            setName(account.getTypeSpecificID());
             setIconBaseWithExtension("org/sleuthkit/autopsy/communications/images/" + Utils.getIconFileName(account.getAccountType()));
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
index 754bc14b3b..4a1d232a1e 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/FiltersPanel.java
@@ -40,12 +40,12 @@ import org.sleuthkit.autopsy.coreutils.ThreadConfined;
 import org.sleuthkit.autopsy.ingest.IngestManager;
 import static org.sleuthkit.autopsy.ingest.IngestManager.IngestModuleEvent.DATA_ADDED;
 import org.sleuthkit.datamodel.Account;
-import org.sleuthkit.datamodel.AccountTypeFilter;
 import org.sleuthkit.datamodel.CommunicationsFilter;
+import org.sleuthkit.datamodel.CommunicationsFilter.AccountTypeFilter;
+import org.sleuthkit.datamodel.CommunicationsFilter.DateRangeFilter;
+import org.sleuthkit.datamodel.CommunicationsFilter.DeviceFilter;
 import org.sleuthkit.datamodel.CommunicationsManager;
 import org.sleuthkit.datamodel.DataSource;
-import org.sleuthkit.datamodel.DateRangeFilter;
-import org.sleuthkit.datamodel.DeviceFilter;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
diff --git a/Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java b/Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java
index a06d5547f0..af53f7c030 100644
--- a/Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/MessageBrowser.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2017 Basis Technology Corp.
+ * Copyright 2017 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -80,7 +80,7 @@ final class MessageBrowser extends javax.swing.JPanel implements ExplorerManager
                     if (selectedNodes.length == 1) {
                         final AccountDeviceInstance accountDeviceInstance = adiNode.getAccountDeviceInstance();
                         accountDeviceInstances = Collections.singleton(accountDeviceInstance);
-                        messagesResultPanel.setPath(accountDeviceInstance.getAccount().getAccountUniqueID());
+                        messagesResultPanel.setPath(accountDeviceInstance.getAccount().getTypeSpecificID());
                     } else {
                         accountDeviceInstances = Stream.of(selectedNodes)
                                 .map(node -> (AccountDeviceInstanceNode) node)