diff --git a/TODO b/TODO
index cea34358..5f30cfda 100644
--- a/TODO
+++ b/TODO
@@ -2,8 +2,6 @@ Before 3.0:
 
 * bug: setComment() doesn't look good
 * bug: Ctrl+D restars the feeder!!!
-* Empty.NOT_SCANNED & Empty.NOT_AVAILABLE and write sorting tests!!!
-* rename abortScanning() to something else
 * command-line scanning start
 * fetcher-specific options
 * multiple port support web-detect
diff --git a/src/net/azib/ipscan/core/Scanner.java b/src/net/azib/ipscan/core/Scanner.java
index 56fef805..ea9efe5c 100755
--- a/src/net/azib/ipscan/core/Scanner.java
+++ b/src/net/azib/ipscan/core/Scanner.java
@@ -42,7 +42,7 @@ public class Scanner {
 		boolean isScanningInterrupted = false;
 		for (Fetcher fetcher : fetcherRegistry.getSelectedFetchers()) {
 			Object value = NotScanned.VALUE;
-			if (!scanningSubject.isAddressScanningAborted() && !isScanningInterrupted) {
+			if (!scanningSubject.isAddressAborted() && !isScanningInterrupted) {
 				// run the fetcher
 				value = fetcher.scan(scanningSubject);
 				// check if scanning was interrupted
diff --git a/src/net/azib/ipscan/core/ScanningSubject.java b/src/net/azib/ipscan/core/ScanningSubject.java
index 51583c17..16bde703 100755
--- a/src/net/azib/ipscan/core/ScanningSubject.java
+++ b/src/net/azib/ipscan/core/ScanningSubject.java
@@ -35,7 +35,7 @@ public class ScanningSubject {
 	/** The result type constant value, can be modified by some Fetchers */
 	private ResultType resultType = ResultType.UNKNOWN;
 	/** Whether we need to continue scanning or it can be aborted */
-	private boolean isScanningAborted = false;
+	private boolean isAborted = false;
 	/** Adapted after pinging port timeout - any fetcher can make use of it */
 	int adaptedPortTimeout = -1; 
 	
@@ -91,17 +91,17 @@ public class ScanningSubject {
 	}
 	
 	/**
-	 * @return true if a fetcher has instructed to abort scanning 
+	 * @return true if a fetcher has instructed to abort scanning of this address 
 	 */
-	public boolean isAddressScanningAborted() {
-		return isScanningAborted;
+	public boolean isAddressAborted() {
+		return isAborted;
 	}
 
 	/**
-	 * Can be used to inform the scanner to abort scanning
+	 * Can be used to inform the scanner to abort scanning of this address
 	 */
 	public void abortAddressScanning() {
-		this.isScanningAborted = true;
+		this.isAborted = true;
 	}
 
 	/**
diff --git a/test/net/azib/ipscan/fetchers/PortsFetcherTest.java b/test/net/azib/ipscan/fetchers/PortsFetcherTest.java
index 660f25a8..4dc0d139 100755
--- a/test/net/azib/ipscan/fetchers/PortsFetcherTest.java
+++ b/test/net/azib/ipscan/fetchers/PortsFetcherTest.java
@@ -56,7 +56,7 @@ public class PortsFetcherTest extends AbstractFetcherTestCase {
 	}
 	
 	@Test
-	public void scanAbortedOnInterrupt() throws Exception {
+	public void scanInterrupted() throws Exception {
 		// these ports are unlikely to be open :-)
 		config.portString = "65530-65535";
 		fetcher.init();