diff --git a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionManager.java b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionTable.java
similarity index 90%
rename from src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionManager.java
rename to src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionTable.java
index bda2035b7..678b0ef17 100644
--- a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionManager.java
+++ b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionTable.java
@@ -17,18 +17,18 @@
 import org.eclipse.ice.datastructures.form.BasicEntryContentProvider;
 import org.eclipse.ice.datastructures.form.Entry;
 import org.eclipse.ice.datastructures.form.IEntryContentProvider;
-import org.eclipse.ice.viz.service.connections.ConnectionManager;
+import org.eclipse.ice.viz.service.connections.ConnectionTable;
 import org.eclipse.ice.viz.service.connections.PortEntry;
 import org.eclipse.ice.viz.service.connections.PortEntryContentProvider;
 
 /**
- * This class extends {@link ConnectionManager} to provide additional connection
+ * This class extends {@link ConnectionTable} to provide additional connection
  * preferences specific to the VisIt vizualization service.
  * 
  * @author Jordan Deyton
  *
  */
-public class VisItConnectionManager extends ConnectionManager {
+public class VisItConnectionTable extends ConnectionTable {
 
 	/*
 	 * (non-Javadoc)
diff --git a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPreferencePage.java b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPreferencePage.java
index 36ce400ca..46dce270f 100644
--- a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPreferencePage.java
+++ b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPreferencePage.java
@@ -18,9 +18,9 @@
 import java.util.Set;
 
 import org.eclipse.ice.viz.service.AbstractVizPreferencePage;
-import org.eclipse.ice.viz.service.connections.ConnectionManager;
+import org.eclipse.ice.viz.service.connections.ConnectionTable;
 import org.eclipse.ice.viz.service.connections.IKeyChangeListener;
-import org.eclipse.ice.viz.service.connections.visit.VisItConnectionManager;
+import org.eclipse.ice.viz.service.connections.visit.VisItConnectionTable;
 import org.eclipse.ice.viz.service.preferences.CustomScopedPreferenceStore;
 import org.eclipse.ice.viz.service.preferences.DynamicComboFieldEditor;
 import org.eclipse.ice.viz.service.preferences.TableComponentComposite;
@@ -45,7 +45,7 @@ public class VisItPreferencePage extends AbstractVizPreferencePage implements
 	 * The {@code ConnectionManager} used by this preference page. It is
 	 * represented by a {@link ConnectionComposite} on the page.
 	 */
-	private final ConnectionManager connectionManager = new VisItConnectionManager();
+	private final ConnectionTable connectionManager = new VisItConnectionTable();
 
 	/**
 	 * This set contains removed keys for pre-existing connections (those that
diff --git a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
index a0ae991ab..d324e1380 100644
--- a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
+++ b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
@@ -22,7 +22,7 @@
 import org.eclipse.ice.viz.service.AbstractVizService;
 import org.eclipse.ice.viz.service.connections.ConnectionState;
 import org.eclipse.ice.viz.service.connections.visit.VisItConnectionAdapter;
-import org.eclipse.ice.viz.service.connections.visit.VisItConnectionManager;
+import org.eclipse.ice.viz.service.connections.visit.VisItConnectionTable;
 import org.eclipse.ice.viz.service.preferences.CustomScopedPreferenceStore;
 import org.eclipse.ice.viz.service.preferences.TableComponentPreferenceAdapter;
 
@@ -51,7 +51,7 @@ public class VisItVizService extends AbstractVizService {
 	 * This manages the {@code VisItVizService} connection preferences and
 	 * should be updated from the preference store when the preferences change.
 	 */
-	private final VisItConnectionManager connectionManager;
+	private final VisItConnectionTable connectionManager;
 
 	/**
 	 * This manages the default connection to VisIt and its settings. It handles
@@ -78,7 +78,7 @@ public VisItVizService() {
 		plots = new ArrayList<VisItPlot>();
 
 		// Initialize the ConnectionManager based on the stored preferences.
-		connectionManager = new VisItConnectionManager();
+		connectionManager = new VisItConnectionTable();
 		TableComponentPreferenceAdapter tableAdapter;
 		tableAdapter = new TableComponentPreferenceAdapter();
 		tableAdapter.toTableComponent(
diff --git a/src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionManager.java b/src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionTable.java
similarity index 95%
rename from src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionManager.java
rename to src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionTable.java
index 54564d70a..4d005ed7e 100644
--- a/src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionManager.java
+++ b/src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionTable.java
@@ -53,7 +53,7 @@
  * @author Jordan Deyton
  *
  */
-public class ConnectionManager extends TableComponent implements IKeyManager,
+public class ConnectionTable extends TableComponent implements IKeyManager,
 		IUpdateableListener {
 
 	// TODO Remove the debug output from this class.
@@ -101,7 +101,7 @@ public class ConnectionManager extends TableComponent implements IKeyManager,
 	/**
 	 * The default constructor.
 	 */
-	public ConnectionManager() {
+	public ConnectionTable() {
 		// Set the default row template. This should never change.
 		super.setRowTemplate(getConnectionTemplate());
 	}
@@ -116,7 +116,7 @@ public void setRowTemplate(ArrayList<Entry> template) {
 
 	/**
 	 * Gets the row template for a connection as defined in the
-	 * {@link ConnectionManager documentation for the class}.
+	 * {@link ConnectionTable documentation for the class}.
 	 * 
 	 * @return An {@code ArrayList<Entry>} containing the template {@code Entry}
 	 *         s for each exposed connection property.