diff --git a/springloaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcherInterface.java b/springloaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcherInterface.java
index 225c729..3859419 100644
--- a/springloaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcherInterface.java
+++ b/springloaded/src/main/java/org/springsource/loaded/agent/FileSystemWatcherInterface.java
@@ -2,7 +2,7 @@ package org.springsource.loaded.agent;
 
 import java.io.File;
 
-public interface AbstractFileSystemWatcher {
+public interface FileSystemWatcherInterface {
 	/**
 	 * Shutdown the thread.
 	 */
diff --git a/springloaded/src/test/java/org/springsource/loaded/test/PollingFileSystemWatcherTests.java b/springloaded/src/test/java/org/springsource/loaded/test/PollingFileSystemWatcherTests.java
index e2f1ff7..d52db7c 100644
--- a/springloaded/src/test/java/org/springsource/loaded/test/PollingFileSystemWatcherTests.java
+++ b/springloaded/src/test/java/org/springsource/loaded/test/PollingFileSystemWatcherTests.java
@@ -35,7 +35,7 @@ import org.springsource.loaded.ReloadableType;
 import org.springsource.loaded.agent.FileSystemWatcher;
 
 
-public class FileSystemWatcherTests {
+public class PollingFileSystemWatcherTests {
 
 	/**
 	 * Create a folder, watch it then put a couple of files in and check they are detected