diff --git a/src/com/dmdirc/commandparser/commands/ExternalCommand.java b/src/com/dmdirc/commandparser/commands/ExternalCommand.java
index 606cc6d06..31621ff4d 100644
--- a/src/com/dmdirc/commandparser/commands/ExternalCommand.java
+++ b/src/com/dmdirc/commandparser/commands/ExternalCommand.java
@@ -22,9 +22,9 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 
 /**
  * An external command is a channel command that can be executed from outside of the channel.
@@ -40,7 +40,7 @@ public interface ExternalCommand {
      * @param isSilent Whether this command is silenced or not
      * @param args     Arguments passed to this command
      */
-    void execute(FrameContainer origin, Connection connection, String channel,
+    void execute(WindowModel origin, Connection connection, String channel,
             boolean isSilent, CommandArguments args);
 
 }
diff --git a/src/com/dmdirc/commandparser/commands/IntelligentCommand.java b/src/com/dmdirc/commandparser/commands/IntelligentCommand.java
index dde107365..bf2c93340 100644
--- a/src/com/dmdirc/commandparser/commands/IntelligentCommand.java
+++ b/src/com/dmdirc/commandparser/commands/IntelligentCommand.java
@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandparser.commands;
 
-import com.dmdirc.FrameContainer;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
@@ -54,20 +54,20 @@ public interface IntelligentCommand {
     class IntelligentCommandContext {
 
         /** The window the command is being entered in. */
-        private final FrameContainer window;
+        private final WindowModel window;
         /** The previously supplied arguments, if any. */
         private final List<String> previousArgs;
         /** The partially typed word, if any. */
         private final String partial;
 
-        public IntelligentCommandContext(final FrameContainer window,
+        public IntelligentCommandContext(final WindowModel window,
                 final List<String> previousArgs, final String partial) {
             this.window = window;
             this.previousArgs = previousArgs;
             this.partial = partial;
         }
 
-        public FrameContainer getWindow() {
+        public WindowModel getWindow() {
             return window;
         }
 
diff --git a/src/com/dmdirc/commandparser/commands/channel/Invite.java b/src/com/dmdirc/commandparser/commands/channel/Invite.java
index 3ed2b01b0..4c226d912 100644
--- a/src/com/dmdirc/commandparser/commands/channel/Invite.java
+++ b/src/com/dmdirc/commandparser/commands/channel/Invite.java
@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -77,7 +76,7 @@ public void execute(@Nonnull final WindowModel origin,
     }
 
     @Override
-    public void execute(final FrameContainer origin, final Connection connection,
+    public void execute(final WindowModel origin, final Connection connection,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length < 1) {
             sendLine(origin, isSilent, FORMAT_ERROR,
diff --git a/src/com/dmdirc/commandparser/commands/channel/Mode.java b/src/com/dmdirc/commandparser/commands/channel/Mode.java
index adc6e8eec..79f2e273f 100644
--- a/src/com/dmdirc/commandparser/commands/channel/Mode.java
+++ b/src/com/dmdirc/commandparser/commands/channel/Mode.java
@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -79,7 +78,7 @@ public void execute(@Nonnull final WindowModel origin,
     }
 
     @Override
-    public void execute(final FrameContainer origin, final Connection connection,
+    public void execute(final WindowModel origin, final Connection connection,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             connection.getParser().get().sendRawMessage("MODE " + channel);
diff --git a/src/com/dmdirc/commandparser/commands/channel/Names.java b/src/com/dmdirc/commandparser/commands/channel/Names.java
index 4a12f9294..4db7d7680 100644
--- a/src/com/dmdirc/commandparser/commands/channel/Names.java
+++ b/src/com/dmdirc/commandparser/commands/channel/Names.java
@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -73,7 +72,7 @@ public void execute(@Nonnull final WindowModel origin,
     }
 
     @Override
-    public void execute(final FrameContainer origin, final Connection connection,
+    public void execute(final WindowModel origin, final Connection connection,
             final String channel, final boolean isSilent, final CommandArguments args) {
         connection.getParser().get().sendRawMessage("NAMES " + channel);
     }
diff --git a/src/com/dmdirc/commandparser/commands/channel/ShowTopic.java b/src/com/dmdirc/commandparser/commands/channel/ShowTopic.java
index 57fa444ff..88d2a8302 100644
--- a/src/com/dmdirc/commandparser/commands/channel/ShowTopic.java
+++ b/src/com/dmdirc/commandparser/commands/channel/ShowTopic.java
@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
-import com.dmdirc.FrameContainer;
 import com.dmdirc.Topic;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -89,7 +88,7 @@ public void execute(@Nonnull final WindowModel origin,
     }
 
     @Override
-    public void execute(final FrameContainer origin, final Connection connection,
+    public void execute(final WindowModel origin, final Connection connection,
             final String channel, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length == 0) {
             connection.getParser().get().sendRawMessage("TOPIC " + channel);
diff --git a/src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java b/src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java
index e388f8b48..7380324d9 100644
--- a/src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java
+++ b/src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java
@@ -67,7 +67,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
             CommandType.TYPE_SERVER);
     /** A map of channel name mentions. */
     @GuardedBy("mentionsLock")
-    private final Multimap<FrameContainer, String> mentions = ArrayListMultimap.create();
+    private final Multimap<WindowModel, String> mentions = ArrayListMultimap.create();
     /** Lock to synchronise on when accessing mentions. */
     private final Object mentionsLock = new Object();
 
@@ -128,7 +128,7 @@ public void handleClientLineAdded(final ClientLineAddedEvent event) {
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {
-        final FrameContainer source = context.getWindow();
+        final WindowModel source = context.getWindow();
         final Connection connection = source.getConnection().get();
         final List<String> results = checkSource(source, true, true);
 
@@ -174,7 +174,7 @@ public AdditionalTabTargets getSuggestions(final int arg,
      *
      * @since 0.6.4
      */
-    protected List<String> checkSource(final FrameContainer source,
+    protected List<String> checkSource(final WindowModel source,
             final boolean checkParents, final boolean checkChildren) {
         final List<String> results = new ArrayList<>();
 
diff --git a/src/com/dmdirc/ui/input/TabCompleterUtils.java b/src/com/dmdirc/ui/input/TabCompleterUtils.java
index ebfc3d775..7b8807c3d 100644
--- a/src/com/dmdirc/ui/input/TabCompleterUtils.java
+++ b/src/com/dmdirc/ui/input/TabCompleterUtils.java
@@ -29,6 +29,7 @@
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -87,7 +88,7 @@ public AdditionalTabTargets getIntelligentResults(final int arg,
      */
     @Nullable
     private AdditionalTabTargets getIntelligentResults(
-            final FrameContainer window,
+            final WindowModel window,
             final CommandArguments args, final String partial) {
         if (!args.isCommand()) {
             return null;