diff --git a/Makefile b/Makefile
index fd36c35..3520cc8 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ prepare:
 # Build Waku Go Bindings
 build: prepare
 	@echo "Building Waku Go Bindings..."
-	go build ./wakuv2/...
+	go build ./waku/...
 
 # Clean up generated files
 clean:
diff --git a/wakuv2/nwaku.go b/waku/nwaku.go
similarity index 99%
rename from wakuv2/nwaku.go
rename to waku/nwaku.go
index 443e256..0ecf62c 100644
--- a/wakuv2/nwaku.go
+++ b/waku/nwaku.go
@@ -1,4 +1,4 @@
-package wakuv2
+package waku
 
 /*
 	#cgo LDFLAGS: -L../third_party/nwaku/build/ -lnegentropy -lwaku
@@ -375,7 +375,7 @@ func (w *Waku) Start() error {
 		return err
 	}
 
-	w.logger.Info("WakuV2 PeerID", zap.Stringer("id", peerID))
+	w.logger.Info("Waku PeerID", zap.Stringer("id", peerID))
 
 	return nil
 }
@@ -504,7 +504,7 @@ func newWakuNode(ctx context.Context, config *WakuConfig) (*WakuNode, error) {
 	return n, nil
 }
 
-// New creates a WakuV2 client ready to communicate through the LibP2P network.
+// New creates a Waku client ready to communicate through the LibP2P network.
 func New(nwakuCfg *WakuConfig, logger *zap.Logger) (*Waku, error) {
 	var err error
 	if logger == nil {
@@ -514,7 +514,7 @@ func New(nwakuCfg *WakuConfig, logger *zap.Logger) (*Waku, error) {
 		}
 	}
 
-	logger.Info("starting wakuv2 with config", zap.Any("nwakuCfg", nwakuCfg))
+	logger.Info("starting Waku with config", zap.Any("nwakuCfg", nwakuCfg))
 
 	ctx, cancel := context.WithCancel(context.Background())
 	wakunode, err := newWakuNode(ctx, nwakuCfg)
diff --git a/wakuv2/nwaku_test.go b/waku/nwaku_test.go
similarity index 99%
rename from wakuv2/nwaku_test.go
rename to waku/nwaku_test.go
index 08490d2..bc4bef4 100644
--- a/wakuv2/nwaku_test.go
+++ b/waku/nwaku_test.go
@@ -1,4 +1,4 @@
-package wakuv2
+package waku
 
 import (
 	"context"
@@ -26,7 +26,7 @@ import (
 // 	--discv5-discovery=true --cluster-id=16 --log-level=DEBUG --shard=64 --tcp-port=61000 \
 // 	--nat=extip:${IP_ADDRESS} --discv5-udp-port=8000 --rest-address=0.0.0.0 --store --rest-port=8646
 
-func TestBasicWakuV2(t *testing.T) {
+func TestBasicWaku(t *testing.T) {
 	extNodeRestPort := 8646
 	storeNodeInfo, err := GetNwakuInfo(nil, &extNodeRestPort)
 	require.NoError(t, err)
diff --git a/wakuv2/nwaku_test_utils.go b/waku/nwaku_test_utils.go
similarity index 99%
rename from wakuv2/nwaku_test_utils.go
rename to waku/nwaku_test_utils.go
index ac355d5..bb923fe 100644
--- a/wakuv2/nwaku_test_utils.go
+++ b/waku/nwaku_test_utils.go
@@ -1,4 +1,4 @@
-package wakuv2
+package waku
 
 import (
 	"encoding/json"