diff --git a/core/src/main/scala/GeocodeStorage.scala b/core/src/main/scala/GeocodeStorage.scala
index 0ac37cf96..61f316dd7 100644
--- a/core/src/main/scala/GeocodeStorage.scala
+++ b/core/src/main/scala/GeocodeStorage.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish
+package com.foursquare.twofishes
import com.twitter.util.{Future, FuturePool}
import org.bson.types.ObjectId
diff --git a/core/src/main/scala/HFileStorageService.scala b/core/src/main/scala/HFileStorageService.scala
index 90b8d926a..0e9ef0f80 100644
--- a/core/src/main/scala/HFileStorageService.scala
+++ b/core/src/main/scala/HFileStorageService.scala
@@ -1,4 +1,4 @@
-package com.foursquare.twofish
+package com.foursquare.twofishes
import java.io._
import java.net.URI
diff --git a/core/src/main/scala/Helpers.scala b/core/src/main/scala/Helpers.scala
index 0fcba507a..21b0c0d7a 100644
--- a/core/src/main/scala/Helpers.scala
+++ b/core/src/main/scala/Helpers.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish
+package com.foursquare.twofishes
import java.text.Normalizer
import java.util.regex.Pattern
diff --git a/core/src/main/scala/LogHelper.scala b/core/src/main/scala/LogHelper.scala
index 2e8c7e95e..2e86da6cd 100644
--- a/core/src/main/scala/LogHelper.scala
+++ b/core/src/main/scala/LogHelper.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish
+package com.foursquare.twofishes
import com.twitter.logging.Logger
import com.twitter.logging.config._
@@ -17,8 +17,8 @@ object LogHelper {
}
object NullLogger {
- def ifTrace(msg: => String) {
- println(msg)
+ def ifTrace(msg: => String) {
+ // println(msg)
}
def error(s: String) {}
def info(s: String) {}
diff --git a/core/src/main/scala/YahooWoeTypes.scala b/core/src/main/scala/YahooWoeTypes.scala
index e9e627f1a..2bf9dd86f 100644
--- a/core/src/main/scala/YahooWoeTypes.scala
+++ b/core/src/main/scala/YahooWoeTypes.scala
@@ -1,7 +1,7 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish
+package com.foursquare.twofishes
-import com.foursquare.twofish.YahooWoeType._
+import com.foursquare.twofishes.YahooWoeType._
object YahooWoeTypes {
val order = List(POSTAL_CODE, AIRPORT, TOWN, SUBURB, ADMIN3, ADMIN2, ADMIN1, COUNTRY)
diff --git a/indexer/src/main/scala/GeocodeRecordWriter.scala b/indexer/src/main/scala/GeocodeRecordWriter.scala
index 8c6855a2a..6b4b01b7b 100644
--- a/indexer/src/main/scala/GeocodeRecordWriter.scala
+++ b/indexer/src/main/scala/GeocodeRecordWriter.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish
+package com.foursquare.twofishes
import com.novus.salat._
import com.novus.salat.global._
diff --git a/indexer/src/main/scala/OutputHFile.scala b/indexer/src/main/scala/OutputHFile.scala
index 436551319..bb63df55b 100644
--- a/indexer/src/main/scala/OutputHFile.scala
+++ b/indexer/src/main/scala/OutputHFile.scala
@@ -1,4 +1,4 @@
-package com.foursquare.twofish
+package com.foursquare.twofishes
import com.mongodb.casbah.Imports._
import com.mongodb.casbah.MongoConnection
diff --git a/indexer/src/main/scala/importers/geonames/BoundingBoxImporter.scala b/indexer/src/main/scala/importers/geonames/BoundingBoxImporter.scala
index e3daa92f9..9d1933418 100644
--- a/indexer/src/main/scala/importers/geonames/BoundingBoxImporter.scala
+++ b/indexer/src/main/scala/importers/geonames/BoundingBoxImporter.scala
@@ -1,7 +1,7 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish.importers.geonames
+package com.foursquare.twofishes.importers.geonames
-import com.foursquare.twofish._
+import com.foursquare.twofishes._
import java.io.File
// I could not for the life of me get the java geojson libraries to work
diff --git a/indexer/src/main/scala/importers/geonames/GeonamesFeature.scala b/indexer/src/main/scala/importers/geonames/GeonamesFeature.scala
index be13af81e..207f44272 100644
--- a/indexer/src/main/scala/importers/geonames/GeonamesFeature.scala
+++ b/indexer/src/main/scala/importers/geonames/GeonamesFeature.scala
@@ -1,8 +1,8 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish.importers.geonames
+package com.foursquare.twofishes.importers.geonames
-import com.foursquare.twofish.Helpers._
-import com.foursquare.twofish.{Helpers, LogHelper, YahooWoeType}
+import com.foursquare.twofishes.Helpers._
+import com.foursquare.twofishes.{Helpers, LogHelper, YahooWoeType}
import org.bson.types.ObjectId
object GeonamesFeatureColumns extends Enumeration {
diff --git a/indexer/src/main/scala/importers/geonames/GeonamesImporterConfig.scala b/indexer/src/main/scala/importers/geonames/GeonamesImporterConfig.scala
index ad01ccfb8..4a16200e9 100644
--- a/indexer/src/main/scala/importers/geonames/GeonamesImporterConfig.scala
+++ b/indexer/src/main/scala/importers/geonames/GeonamesImporterConfig.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish.importers.geonames
+package com.foursquare.twofishes.importers.geonames
class GeonamesImporterConfig(args: Array[String]) {
// Buildings are places like the eiffel tower, but also schools and federal offices.
@@ -26,7 +26,7 @@ class GeonamesImporterConfig(args: Array[String]) {
private val config = this
val parser =
- new scopt.OptionParser("twofish", "0.12") {
+ new scopt.OptionParser("twofishes", "0.12") {
booleanOpt("parse_world", "parse the whole world, or one country",
{ v: Boolean => config.parseWorld = v } )
opt("parse_country", "country to parse, two letter iso code",
diff --git a/indexer/src/main/scala/importers/geonames/GeonamesParser.scala b/indexer/src/main/scala/importers/geonames/GeonamesParser.scala
index 7eb009cfe..40049c871 100644
--- a/indexer/src/main/scala/importers/geonames/GeonamesParser.scala
+++ b/indexer/src/main/scala/importers/geonames/GeonamesParser.scala
@@ -1,9 +1,9 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish.importers.geonames
+package com.foursquare.twofishes.importers.geonames
-import com.foursquare.twofish._
-import com.foursquare.twofish.Helpers._
-import com.foursquare.twofish.Implicits._
+import com.foursquare.twofishes._
+import com.foursquare.twofishes.Helpers._
+import com.foursquare.twofishes.Implicits._
import java.io.File
object GeonamesParser {
diff --git a/indexer/src/main/scala/importers/geonames/TsvHelperFileParser.scala b/indexer/src/main/scala/importers/geonames/TsvHelperFileParser.scala
index 3fafa7690..33e5b6ad3 100644
--- a/indexer/src/main/scala/importers/geonames/TsvHelperFileParser.scala
+++ b/indexer/src/main/scala/importers/geonames/TsvHelperFileParser.scala
@@ -1,7 +1,7 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved.
-package com.foursquare.twofish.importers.geonames
+package com.foursquare.twofishes.importers.geonames
-import com.foursquare.twofish.LogHelper
+import com.foursquare.twofishes.LogHelper
import java.io.File
class TsvHelperFileParser(filename: String) extends LogHelper {
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/FeatureGeometry.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureGeometry.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/FeatureGeometry.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureGeometry.java
index 44ada178e..1e1751312 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/FeatureGeometry.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureGeometry.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/FeatureId.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureId.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/FeatureId.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureId.java
index 5182de67b..b01128637 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/FeatureId.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureId.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/FeatureName.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureName.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/FeatureName.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureName.java
index 6e9e88823..325037f64 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/FeatureName.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureName.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/FeatureNameFlags.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureNameFlags.java
similarity index 96%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/FeatureNameFlags.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureNameFlags.java
index 2ae3378d0..880038007 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/FeatureNameFlags.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/FeatureNameFlags.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.Map;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeBoundingBox.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeBoundingBox.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeBoundingBox.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeBoundingBox.java
index 8608663b5..423ad359a 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeBoundingBox.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeBoundingBox.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeFeature.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeFeature.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeFeature.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeFeature.java
index 69d101c8b..232ea6676 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeFeature.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeFeature.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeInterpretation.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeInterpretation.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeInterpretation.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeInterpretation.java
index cd17d9e2c..cdd43bb05 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeInterpretation.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeInterpretation.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodePoint.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodePoint.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/GeocodePoint.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodePoint.java
index b55c65373..0a520f6fa 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodePoint.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodePoint.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeRequest.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeRequest.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeRequest.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeRequest.java
index 620e2170e..0e5e11a36 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeRequest.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeRequest.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeResponse.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeResponse.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeResponse.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeResponse.java
index f48feff92..ff54dbb86 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeResponse.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeResponse.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeServingFeature.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeServingFeature.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeServingFeature.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeServingFeature.java
index 5a37a5043..8e8d6c8c9 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/GeocodeServingFeature.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/GeocodeServingFeature.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/Geocoder.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/Geocoder.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/Geocoder.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/Geocoder.java
index b07ff8f11..80dbfec73 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/Geocoder.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/Geocoder.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/ScoringFeatures.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/ScoringFeatures.java
similarity index 99%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/ScoringFeatures.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/ScoringFeatures.java
index 91ff92fb9..2812df143 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/ScoringFeatures.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/ScoringFeatures.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.List;
import java.util.ArrayList;
diff --git a/interface/src/main/java/gen-java/com/foursquare/twofish/YahooWoeType.java b/interface/src/main/java/gen-java/com/foursquare/twofishes/YahooWoeType.java
similarity index 97%
rename from interface/src/main/java/gen-java/com/foursquare/twofish/YahooWoeType.java
rename to interface/src/main/java/gen-java/com/foursquare/twofishes/YahooWoeType.java
index 61524483d..e0f946f59 100644
--- a/interface/src/main/java/gen-java/com/foursquare/twofish/YahooWoeType.java
+++ b/interface/src/main/java/gen-java/com/foursquare/twofishes/YahooWoeType.java
@@ -3,7 +3,7 @@
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
-package com.foursquare.twofish;
+package com.foursquare.twofishes;
import java.util.Map;
diff --git a/interface/src/main/thrift/geocoder.thrift b/interface/src/main/thrift/geocoder.thrift
index c94ccf57a..26c55643d 100644
--- a/interface/src/main/thrift/geocoder.thrift
+++ b/interface/src/main/thrift/geocoder.thrift
@@ -1,4 +1,4 @@
-namespace java com.foursquare.twofish
+namespace java com.foursquare.twofishes
// comments from http://developer.yahoo.com/geo/geoplanet/guide/concepts.html
enum YahooWoeType {
diff --git a/project/GeocoderBuild.scala b/project/GeocoderBuild.scala
index ebc5b9a4f..a563c0acc 100644
--- a/project/GeocoderBuild.scala
+++ b/project/GeocoderBuild.scala
@@ -5,8 +5,8 @@ import AssemblyKeys._
object GeocoderBuild extends Build {
lazy val buildSettings = Seq(
- organization := "com.foursquare.twofish",
- name := "twofish",
+ organization := "com.foursquare.twofishes",
+ name := "twofishes",
version := "0.12",
scalaVersion := "2.9.1"
)
@@ -28,7 +28,7 @@ object GeocoderBuild extends Build {
Keys.publishArtifact in (Compile, Keys.packageDoc) := false,
pomExtra := (
- http://github.com/foursquare/twofish
+ http://github.com/foursquare/twofishes
Apache
@@ -37,8 +37,8 @@ object GeocoderBuild extends Build {
- git@github.com:foursquare/twofish.git
- scm:git:git@github.com:foursquare/twofish.git
+ git@github.com:foursquare/twofishes.git
+ scm:git:git@github.com:foursquare/twofishes.git
@@ -105,7 +105,7 @@ object GeocoderBuild extends Build {
lazy val server = Project(id = "server",
settings = defaultSettings ++ assemblySettings ++ Seq(
- mainClass in assembly := Some("com.foursquare.twofish.GeocodeFinagleServer"),
+ mainClass in assembly := Some("com.foursquare.twofishes.GeocodeFinagleServer"),
publishArtifact := true,
libraryDependencies ++= Seq(
"com.twitter" % "finagle-http_2.9.1" % "1.9.12",
diff --git a/server/src/main/scala/GeocodeImpl.scala b/server/src/main/scala/GeocodeImpl.scala
index 0c5c15802..34918f2e3 100644
--- a/server/src/main/scala/GeocodeImpl.scala
+++ b/server/src/main/scala/GeocodeImpl.scala
@@ -1,7 +1,7 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved
-package com.foursquare.twofish
+package com.foursquare.twofishes
-import com.foursquare.twofish.Implicits._
+import com.foursquare.twofishes.Implicits._
import com.twitter.util.{Future, FuturePool}
import java.util.concurrent.ConcurrentHashMap
import org.bson.types.ObjectId
@@ -266,14 +266,10 @@ class GeocoderImpl(store: GeocodeStorageFutureReadService) extends LogHelper {
val connectorEnd = connectorStart
val hadConnector = connectorStart != -1
- println(hadConnector)
-
val tokens = if (hadConnector) {
originalTokens.drop(connectorEnd + 1)
} else { originalTokens }
- println(tokens)
-
val cache = generateParses(tokens)
val futureCache: Iterable[Future[(Int, ParseSeq)]] = cache.map({case (k, v) => {
Future.value(k).join(v)
diff --git a/server/src/main/scala/GeocodeServer.scala b/server/src/main/scala/GeocodeServer.scala
index ac086e9f3..675323cfe 100644
--- a/server/src/main/scala/GeocodeServer.scala
+++ b/server/src/main/scala/GeocodeServer.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved
-package com.foursquare.twofish
+package com.foursquare.twofishes
import collection.JavaConverters._
import com.twitter.finagle.builder.{ServerBuilder, Server}
diff --git a/server/src/main/scala/GeocodeServerConfig.scala b/server/src/main/scala/GeocodeServerConfig.scala
index 93878bcc8..3bc0983ee 100644
--- a/server/src/main/scala/GeocodeServerConfig.scala
+++ b/server/src/main/scala/GeocodeServerConfig.scala
@@ -1,5 +1,5 @@
// Copyright 2012 Foursquare Labs Inc. All Rights Reserved
-package com.foursquare.twofish
+package com.foursquare.twofishes
class GeocodeServerConfig(args: Array[String]) {
var runHttpServer: Boolean = true
@@ -9,7 +9,7 @@ class GeocodeServerConfig(args: Array[String]) {
private val config = this
val parser =
- new scopt.OptionParser("twofish", "0.12") {
+ new scopt.OptionParser("twofishes", "0.12") {
intOpt("p", "port", "port to run thrift server on",
{ v: Int => config.thriftServerPort = v } )
booleanOpt("h", "run_http_server", "whether or not to run http/json server on port+1",