diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ConsolePrinter.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ConsolePrinter.java
index b5e9445..beacffd 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ConsolePrinter.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ConsolePrinter.java
@@ -49,11 +49,11 @@
     out = console.newMessageStream();
   }
 
-  void printSignal(String s) {
+  void printCommand(String s) {
     out.println("[command] " + s);
   }
 
-  void printOutput(String s) {
+  void printProtocOutput(String s) {
     out.println("[protoc]  " + s);
   }
 
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtobufBuildParticipant.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtobufBuildParticipant.java
index 57156f6..ed4e295 100644
--- a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtobufBuildParticipant.java
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/builder/protoc/ProtobufBuildParticipant.java
@@ -143,7 +143,7 @@
     ConsolePrinter console = null;
     try {
       console = createAndDisplayConsole();
-      console.printSignal(command);
+      console.printCommand(command);
       Process process = Runtime.getRuntime().exec(command);
       processStream(process.getErrorStream(), source, console);
       process.destroy();
@@ -166,7 +166,7 @@
       ProtocMarkerFactory markerFactory = new ProtocMarkerFactory(source);
       while ((line = bufferedReader.readLine()) != null) {
         outputParser.parseAndAddMarkerIfNecessary(line, markerFactory);
-        console.printOutput(line);
+        console.printProtocOutput(line);
       }
     } finally {
       closeQuietly(reader);
