diff --git a/cmd/streamEthSubscribe.go b/cmd/streamEthSubscribe.go
index 74d5b275..4f615902 100644
--- a/cmd/streamEthSubscribe.go
+++ b/cmd/streamEthSubscribe.go
@@ -32,7 +32,7 @@ import (
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/core"
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth"
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/streamer"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watch"
 )
 
 // streamEthSubscriptionCmd represents the streamEthSubscription command
diff --git a/cmd/watch.go b/cmd/watch.go
index b5a8e3a2..f03b32dc 100644
--- a/cmd/watch.go
+++ b/cmd/watch.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs"
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watch"
 	v "github.com/vulcanize/ipfs-blockchain-watcher/version"
 )
 
diff --git a/documentation/apis.md b/documentation/apis.md
index c098eccc..ab329875 100644
--- a/documentation/apis.md
+++ b/documentation/apis.md
@@ -22,7 +22,7 @@ All of their data can then be queried with standard [GraphQL](https://graphql.or
 
 
 ### RPC Subscription Interface
-A direct, real-time subscription to the data being processed by ipfs-blockchain-watcher can be established over WS or IPC through the [Stream](../pkg/watcher/api.go#L53) RPC method.
+A direct, real-time subscription to the data being processed by ipfs-blockchain-watcher can be established over WS or IPC through the [Stream](../pkg/watch/api.go#L53) RPC method.
 This method is not chain-specific and each chain-type supports it, it is accessed under the "vdb" namespace rather than a chain-specific namespace. An interface for
 subscribing to this endpoint is provided [here](../pkg/streamer/super_node_streamer.go).
 
@@ -43,7 +43,7 @@ An example of how to subscribe to a real-time Ethereum data feed from ipfs-block
         "github.com/vulcanize/ipfs-blockchain-watcher/pkg/client"
         "github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth"
         "github.com/vulcanize/ipfs-blockchain-watcher/pkg/streamer"
-        "github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+        "github.com/vulcanize/ipfs-blockchain-watcher/pkg/watch"
     )
 
     config, _ := eth.NewEthSubscriptionConfig()
diff --git a/pkg/resync/service.go b/pkg/resync/service.go
index 8e328cff..f14c856a 100644
--- a/pkg/resync/service.go
+++ b/pkg/resync/service.go
@@ -22,7 +22,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watch"
 	"github.com/vulcanize/ipfs-blockchain-watcher/utils"
 )
 
diff --git a/pkg/streamer/super_node_streamer.go b/pkg/streamer/super_node_streamer.go
index 66f5968e..94af4539 100644
--- a/pkg/streamer/super_node_streamer.go
+++ b/pkg/streamer/super_node_streamer.go
@@ -21,7 +21,7 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/core"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watch"
 )
 
 // SuperNodeStreamer is the underlying struct for the shared.SuperNodeStreamer interface
diff --git a/pkg/watcher/api.go b/pkg/watch/api.go
similarity index 100%
rename from pkg/watcher/api.go
rename to pkg/watch/api.go
diff --git a/pkg/watcher/backfiller.go b/pkg/watch/backfiller.go
similarity index 100%
rename from pkg/watcher/backfiller.go
rename to pkg/watch/backfiller.go
diff --git a/pkg/watcher/backfiller_test.go b/pkg/watch/backfiller_test.go
similarity index 99%
rename from pkg/watcher/backfiller_test.go
rename to pkg/watch/backfiller_test.go
index 8d6d4353..af337d93 100644
--- a/pkg/watcher/backfiller_test.go
+++ b/pkg/watch/backfiller_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth/mocks"
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
 	mocks2 "github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared/mocks"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watch"
 )
 
 var _ = Describe("BackFiller", func() {
diff --git a/pkg/watcher/config.go b/pkg/watch/config.go
similarity index 100%
rename from pkg/watcher/config.go
rename to pkg/watch/config.go
diff --git a/pkg/watcher/constructors.go b/pkg/watch/constructors.go
similarity index 100%
rename from pkg/watcher/constructors.go
rename to pkg/watch/constructors.go
diff --git a/pkg/watcher/helpers.go b/pkg/watch/helpers.go
similarity index 100%
rename from pkg/watcher/helpers.go
rename to pkg/watch/helpers.go
diff --git a/pkg/watcher/service.go b/pkg/watch/service.go
similarity index 100%
rename from pkg/watcher/service.go
rename to pkg/watch/service.go
diff --git a/pkg/watcher/service_test.go b/pkg/watch/service_test.go
similarity index 97%
rename from pkg/watcher/service_test.go
rename to pkg/watch/service_test.go
index 6c40cd8f..f731cd51 100644
--- a/pkg/watcher/service_test.go
+++ b/pkg/watch/service_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth/mocks"
 	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
 	mocks2 "github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared/mocks"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watch"
 )
 
 var _ = Describe("Service", func() {
diff --git a/pkg/watcher/subscription.go b/pkg/watch/subscription.go
similarity index 100%
rename from pkg/watcher/subscription.go
rename to pkg/watch/subscription.go
diff --git a/pkg/watcher/super_node_suite_test.go b/pkg/watch/super_node_suite_test.go
similarity index 100%
rename from pkg/watcher/super_node_suite_test.go
rename to pkg/watch/super_node_suite_test.go