More consistent naming.

13 files changed, 63 insertions, 63 deletions

diff --git a/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala
index 92f4578..c6a210c 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/FilterDecoratedSpec.scala
@@ -1,8 +1,8 @@
 package com.rockymadden.stringmetric
 
+import com.rockymadden.stringmetric.filter.AsciiNumberFilter
 import com.rockymadden.stringmetric.phonetic.MetaphoneAlgorithm
 import com.rockymadden.stringmetric.similarity.DiceSorensenMetric
-import com.rockymadden.stringmetric.filter.AsciiNumberStringFilter
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
@@ -33,6 +33,6 @@ final class FilterDecoratedSpec extends ScalaTest {
 }
 
 object FilterDecoratedSpec {
-	private final val Algorithm = new MetaphoneAlgorithm with AsciiNumberStringFilter
-	private final val Metric = new DiceSorensenMetric with AsciiNumberStringFilter
+	private final val Algorithm = new MetaphoneAlgorithm with AsciiNumberFilter
+	private final val Metric = new DiceSorensenMetric with AsciiNumberFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlFilterSpec.scala
index 5c774a0..1cce0c9 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiControlStringFilterSpec extends ScalaTest {
-	import AsciiControlStringFilterSpec.Filter
+final class AsciiControlFilterSpec extends ScalaTest {
+	import AsciiControlFilterSpec.Filter
 
-	"AsciiControlStringFilter" should provide {
+	"AsciiControlFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with controls" should returns {
 				"String with controls removed" in {
@@ -28,6 +28,6 @@ final class AsciiControlStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiControlStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiControlStringFilter
+object AsciiControlFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiControlFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilterSpec.scala
index 8d5d1d4..958c8ba 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiControlOnlyFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiControlOnlyStringFilterSpec extends ScalaTest {
-	import AsciiControlOnlyStringFilterSpec.Filter
+final class AsciiControlOnlyFilterSpec extends ScalaTest {
+	import AsciiControlOnlyFilterSpec.Filter
 
-	"AsciiControlOnlyStringFilter" should provide {
+	"AsciiControlOnlyFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with mixed characters" should returns {
 				"String with non-controls removed" in {
@@ -28,6 +28,6 @@ final class AsciiControlOnlyStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiControlOnlyStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiControlOnlyStringFilter
+object AsciiControlOnlyFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiControlOnlyFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilterSpec.scala
index 5ca7324..d86e7a5 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiLetterStringFilterSpec extends ScalaTest {
-	import AsciiLetterStringFilterSpec.Filter
+final class AsciiLetterFilterSpec extends ScalaTest {
+	import AsciiLetterFilterSpec.Filter
 
-	"AsciiLetterStringFilter" should provide {
+	"AsciiLetterFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with letters" should returns {
 				"String with letters removed" in {
@@ -24,6 +24,6 @@ final class AsciiLetterStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiLetterStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiLetterStringFilter
+object AsciiLetterFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiLetterFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilterSpec.scala
index 4b548f0..edfdce6 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiLetterNumberStringFilterSpec extends ScalaTest {
-	import AsciiLetterNumberStringFilterSpec.Filter
+final class AsciiLetterNumberFilterSpec extends ScalaTest {
+	import AsciiLetterNumberFilterSpec.Filter
 
-	"AsciiLetterNumberStringFilter" should provide {
+	"AsciiLetterNumberFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with letters and numbers" should returns {
 				"String with letters and numbers removed" in {
@@ -28,6 +28,6 @@ final class AsciiLetterNumberStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiLetterNumberStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiLetterNumberStringFilter
+object AsciiLetterNumberFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiLetterNumberFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilterSpec.scala
index 8e488c5..7998e39 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterNumberOnlyFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiLetterNumberOnlyStringFilterSpec extends ScalaTest {
-	import AsciiLetterNumberOnlyStringFilterSpec.Filter
+final class AsciiLetterNumberOnlyFilterSpec extends ScalaTest {
+	import AsciiLetterNumberOnlyFilterSpec.Filter
 
-	"AsciiLetterNumberOnlyStringFilter" should provide {
+	"AsciiLetterNumberOnlyFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with mixed characters" should returns {
 				"String with non-letters and non-numbers removed" in {
@@ -30,6 +30,6 @@ final class AsciiLetterNumberOnlyStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiLetterNumberOnlyStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiLetterNumberOnlyStringFilter
+object AsciiLetterNumberOnlyFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiLetterNumberOnlyFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilterSpec.scala
index f33050c..d134792 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiLetterOnlyFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiLetterOnlyStringFilterSpec extends ScalaTest {
-	import AsciiLetterOnlyStringFilterSpec.Filter
+final class AsciiLetterOnlyFilterSpec extends ScalaTest {
+	import AsciiLetterOnlyFilterSpec.Filter
 
-	"AsciiLetterOnlyStringFilter" should provide {
+	"AsciiLetterOnlyFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with mixed characters" should returns {
 				"String with non-letters removed" in {
@@ -28,6 +28,6 @@ final class AsciiLetterOnlyStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiLetterOnlyStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiLetterOnlyStringFilter
+object AsciiLetterOnlyFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiLetterOnlyFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilterSpec.scala
index b1ed8a0..7c24d45 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiNumberStringFilterSpec extends ScalaTest {
-	import AsciiNumberStringFilterSpec.Filter
+final class AsciiNumberFilterSpec extends ScalaTest {
+	import AsciiNumberFilterSpec.Filter
 
-	"AsciiNumberStringFilter" should provide {
+	"AsciiNumberFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with numbers" should returns {
 				"String with numbers removed" in {
@@ -28,6 +28,6 @@ final class AsciiNumberStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiNumberStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiNumberStringFilter
+object AsciiNumberFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiNumberFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilterSpec.scala
index 147d9b6..db49d25 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiNumberOnlyFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiNumberOnlyStringFilterSpec extends ScalaTest {
-	import AsciiNumberOnlyStringFilterSpec.Filter
+final class AsciiNumberOnlyFilterSpec extends ScalaTest {
+	import AsciiNumberOnlyFilterSpec.Filter
 
-	"AsciiNumberOnlyStringFilter" should provide {
+	"AsciiNumberOnlyFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with mixed characters" should returns {
 				"String with non-numbers removed" in {
@@ -28,6 +28,6 @@ final class AsciiNumberOnlyStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiNumberOnlyStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiNumberOnlyStringFilter
+object AsciiNumberOnlyFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiNumberOnlyFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilterSpec.scala
index 6ee45b1..759db3d 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSpaceFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiSpaceStringFilterSpec extends ScalaTest {
-	import AsciiSpaceStringFilterSpec.Filter
+final class AsciiSpaceFilterSpec extends ScalaTest {
+	import AsciiSpaceFilterSpec.Filter
 
-	"AsciiSpaceStringFilter" should provide {
+	"AsciiSpaceFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with spaces" should returns {
 				"String with spaces removed" in {
@@ -32,6 +32,6 @@ final class AsciiSpaceStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiSpaceStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiSpaceStringFilter
+object AsciiSpaceFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiSpaceFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilterSpec.scala
index 2e4a0e0..99be533 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiSymbolStringFilterSpec extends ScalaTest {
-	import AsciiSymbolStringFilterSpec.Filter
+final class AsciiSymbolFilterSpec extends ScalaTest {
+	import AsciiSymbolFilterSpec.Filter
 
-	"AsciiSymbolStringFilter" should provide {
+	"AsciiSymbolFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with symbols" should returns {
 				"String with symbols removed" in {
@@ -26,6 +26,6 @@ final class AsciiSymbolStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiSymbolStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiSymbolStringFilter
+object AsciiSymbolFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiSymbolFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilterSpec.scala
index 8d5c2fb..c6f1899 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/AsciiSymbolOnlyFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class AsciiSymbolOnlyStringFilterSpec extends ScalaTest {
-	import AsciiSymbolOnlyStringFilterSpec.Filter
+final class AsciiSymbolOnlyFilterSpec extends ScalaTest {
+	import AsciiSymbolOnlyFilterSpec.Filter
 
-	"AsciiSymbolOnlyStringFilter" should provide {
+	"AsciiSymbolOnlyFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with mixed characters" should returns {
 				"String with non-symbols removed" in {
@@ -28,6 +28,6 @@ final class AsciiSymbolOnlyStringFilterSpec extends ScalaTest {
 	}
 }
 
-object AsciiSymbolOnlyStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with AsciiSymbolOnlyStringFilter
+object AsciiSymbolOnlyFilterSpec {
+	private final val Filter = new StringFilterDelegate with AsciiSymbolOnlyFilter
 }
diff --git a/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilterSpec.scala b/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilterSpec.scala
index 4defbc2..a04a0ae 100755
--- a/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseStringFilterSpec.scala
+++ b/core/source/test/scala/com/rockymadden/stringmetric/filter/IgnoreAsciiLetterCaseFilterSpec.scala
@@ -5,10 +5,10 @@ import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
-final class IgnoreAsciiLetterCaseStringFilterSpec extends ScalaTest {
-	import IgnoreAsciiLetterCaseStringFilterSpec.Filter
+final class IgnoreAsciiLetterCaseFilterSpec extends ScalaTest {
+	import IgnoreAsciiLetterCaseFilterSpec.Filter
 
-	"IgnoreAsciiLetterCaseStringFilter" should provide {
+	"IgnoreAsciiLetterCaseFilter" should provide {
 		"overloaded filter method" when passed {
 			"String with mixed case" should returns {
 				"String with the same case" in {
@@ -36,6 +36,6 @@ final class IgnoreAsciiLetterCaseStringFilterSpec extends ScalaTest {
 	}
 }
 
-object IgnoreAsciiLetterCaseStringFilterSpec {
-	private final val Filter = new StringFilterDelegate with IgnoreAsciiLetterCaseStringFilter
+object IgnoreAsciiLetterCaseFilterSpec {
+	private final val Filter = new StringFilterDelegate with IgnoreAsciiLetterCaseFilter
 }