diff --git a/README.md b/README.md
index f64da4aa..c8fc8c82 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ Changelog can be seen [here.](/docs/changelog.md) It is also visible inside rcc
 
 Some tips, tricks, and recipes can be found [here.](/docs/recipes.md) They are also visible inside rcc using command `rcc docs recipes`.
 
-## Community
+## Community and Support
 
 The Robocorp community can be found on [Developer Slack](https://robocorp-developers.slack.com), where you can ask questions, voice ideas, and share your projects.
 
diff --git a/cmd/peercc/main.go b/cmd/rccremote/main.go
similarity index 79%
rename from cmd/peercc/main.go
rename to cmd/rccremote/main.go
index 7eb72438..933cc4fc 100644
--- a/cmd/peercc/main.go
+++ b/cmd/rccremote/main.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/robocorp/rcc/common"
 	"github.com/robocorp/rcc/pathlib"
-	"github.com/robocorp/rcc/peercc"
 	"github.com/robocorp/rcc/pretty"
+	"github.com/robocorp/rcc/remotree"
 )
 
 var (
@@ -20,7 +20,7 @@ var (
 )
 
 func defaultHoldLocation() string {
-	where, err := pathlib.Abs(filepath.Join(pathlib.TempDir(), "peercchold"))
+	where, err := pathlib.Abs(filepath.Join(pathlib.TempDir(), "rccremotehold"))
 	if err != nil {
 		return "temphold"
 	}
@@ -31,7 +31,7 @@ func init() {
 	flag.BoolVar(&common.DebugFlag, "debug", false, "Turn on debugging output.")
 	flag.BoolVar(&common.TraceFlag, "trace", false, "Turn on tracing output.")
 
-	flag.BoolVar(&versionFlag, "version", false, "Just show peercc version and exit.")
+	flag.BoolVar(&versionFlag, "version", false, "Just show rccremote version and exit.")
 	flag.StringVar(&serverName, "hostname", "localhost", "Hostname/address to bind server to.")
 	flag.IntVar(&serverPort, "port", 4653, "Port to bind server in given hostname.")
 	flag.StringVar(&holdingArea, "hold", defaultHoldLocation(), "Directory where to put HOLD files once known.")
@@ -62,9 +62,9 @@ func process() {
 	if versionFlag {
 		showVersion()
 	}
-	pretty.Guard(common.SharedHolotree, 1, "Shared holotree must be enabled and in use for peercc to work.")
-	common.Log("Peer for rcc starting (%s) ...", common.Version)
-	peercc.Serve(serverName, serverPort, domainId, holdingArea)
+	pretty.Guard(common.SharedHolotree, 1, "Shared holotree must be enabled and in use for rccremote to work.")
+	common.Log("Remote for rcc starting (%s) ...", common.Version)
+	remotree.Serve(serverName, serverPort, domainId, holdingArea)
 }
 
 func main() {
diff --git a/cmd/peercc/main_test.go b/cmd/rccremote/main_test.go
similarity index 100%
rename from cmd/peercc/main_test.go
rename to cmd/rccremote/main_test.go
diff --git a/common/version.go b/common/version.go
index f6ee6ea7..22c88872 100644
--- a/common/version.go
+++ b/common/version.go
@@ -1,5 +1,5 @@
 package common
 
 const (
-	Version = `v13.3.0`
+	Version = `v13.4.0`
 )
diff --git a/docs/changelog.md b/docs/changelog.md
index 40651320..788cf876 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,5 +1,9 @@
 # rcc change log
 
+## v13.4.0 (date: 30.1.2023)
+
+- peercc is renamed to rccremote, and peercc package renamed to remotree
+
 ## v13.3.0 (date: 27.1.2023)
 
 - feature: command for prebuilding environments (from files or from URLs)
diff --git a/operations/pull.go b/operations/pull.go
index ac057c4c..aeadd5cd 100644
--- a/operations/pull.go
+++ b/operations/pull.go
@@ -61,7 +61,7 @@ func downloadMissingEnvironmentParts(origin, catalogName, selection string) (fil
 	url := fmt.Sprintf("%s/delta/%s", origin, catalogName)
 
 	body := strings.NewReader(selection)
-	filename = filepath.Join(pathlib.TempDir(), fmt.Sprintf("peercc_%x.zip", os.Getpid()))
+	filename = filepath.Join(pathlib.TempDir(), fmt.Sprintf("rccremote_%x.zip", os.Getpid()))
 
 	client := &http.Client{Transport: settings.Global.ConfiguredHttpTransport()}
 	request, err := http.NewRequest("POST", url, body)
@@ -91,7 +91,7 @@ func downloadMissingEnvironmentParts(origin, catalogName, selection string) (fil
 	fail.On(err != nil, "Download failed, reason: %v", err)
 
 	sum := fmt.Sprintf("%02x", digest.Sum(nil))
-	finalname := filepath.Join(pathlib.TempDir(), fmt.Sprintf("peercc_%s.zip", sum))
+	finalname := filepath.Join(pathlib.TempDir(), fmt.Sprintf("rccremote_%s.zip", sum))
 	err = pathlib.TryRename("delta", filename, finalname)
 	fail.On(err != nil, "Rename %q -> %q failed, reason: %v", filename, finalname, err)
 
diff --git a/peercc/missing_test.go b/peercc/missing_test.go
deleted file mode 100644
index fa32ef9f..00000000
--- a/peercc/missing_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package peercc_test
diff --git a/peercc/delta.go b/remotree/delta.go
similarity index 99%
rename from peercc/delta.go
rename to remotree/delta.go
index f88cf6fe..a7263356 100644
--- a/peercc/delta.go
+++ b/remotree/delta.go
@@ -1,4 +1,4 @@
-package peercc
+package remotree
 
 import (
 	"archive/zip"
diff --git a/peercc/listings.go b/remotree/listings.go
similarity index 97%
rename from peercc/listings.go
rename to remotree/listings.go
index c0660094..dde911c5 100644
--- a/peercc/listings.go
+++ b/remotree/listings.go
@@ -1,4 +1,4 @@
-package peercc
+package remotree
 
 import (
 	"bufio"
@@ -54,7 +54,7 @@ func makeQueryHandler(queries Partqueries, triggers chan string) http.HandlerFun
 
 func loadSingleCatalog(catalog string) (root *htfs.Root, err error) {
 	defer fail.Around(&err)
-	tempdir := filepath.Join(common.RobocorpTemp(), "peercc")
+	tempdir := filepath.Join(common.RobocorpTemp(), "rccremote")
 	shadow, err := htfs.NewRoot(tempdir)
 	fail.On(err != nil, "Could not create root, reason: %v", err)
 	filename := filepath.Join(common.HololibCatalogLocation(), catalog)
diff --git a/peercc/manage.go b/remotree/manage.go
similarity index 96%
rename from peercc/manage.go
rename to remotree/manage.go
index 5963d656..8764904c 100644
--- a/peercc/manage.go
+++ b/remotree/manage.go
@@ -1,4 +1,4 @@
-package peercc
+package remotree
 
 import (
 	"path/filepath"
diff --git a/peercc/messages.go b/remotree/messages.go
similarity index 85%
rename from peercc/messages.go
rename to remotree/messages.go
index 6449fe4c..de32f1cb 100644
--- a/peercc/messages.go
+++ b/remotree/messages.go
@@ -1,4 +1,4 @@
-package peercc
+package remotree
 
 type (
 	Partquery struct {
diff --git a/remotree/missing_test.go b/remotree/missing_test.go
new file mode 100644
index 00000000..3410dd67
--- /dev/null
+++ b/remotree/missing_test.go
@@ -0,0 +1 @@
+package remotree_test
diff --git a/peercc/server.go b/remotree/server.go
similarity index 98%
rename from peercc/server.go
rename to remotree/server.go
index 75ef63e9..06102e1b 100644
--- a/peercc/server.go
+++ b/remotree/server.go
@@ -1,4 +1,4 @@
-package peercc
+package remotree
 
 import (
 	"context"
diff --git a/peercc/trigger.go b/remotree/trigger.go
similarity index 98%
rename from peercc/trigger.go
rename to remotree/trigger.go
index 955e8616..2d2c3bf6 100644
--- a/peercc/trigger.go
+++ b/remotree/trigger.go
@@ -1,4 +1,4 @@
-package peercc
+package remotree
 
 import (
 	"net/http"