diff --git a/README.md b/README.md
index 92ab1d7..81e6bfe 100644
--- a/README.md
+++ b/README.md
@@ -138,7 +138,7 @@ A simple test suite is provided, and can be run with:
 $ go test
 ```
 
-The tests expect a Redis server with the FalkorDB module loaded to be available at localhost:6379
+The tests expect a FalkorDB server to be available at localhost:6379
 
 ## License
 
diff --git a/client_test.go b/client_test.go
index d3e3c9b..5f43aec 100644
--- a/client_test.go
+++ b/client_test.go
@@ -108,7 +108,7 @@ func checkQueryResults(t *testing.T, res *QueryResult) {
 }
 
 func TestCreateQuery(t *testing.T) {
-	q := "CREATE (w:WorkPlace {name:'RedisLabs'})"
+	q := "CREATE (w:WorkPlace {name:'FalkorDB'})"
 	res, err := graph.Query(q)
 	if err != nil {
 		t.Error(err)
@@ -134,7 +134,7 @@ func TestCreateQuery(t *testing.T) {
 }
 
 func TestCreateROQueryFailure(t *testing.T) {
-	q := "CREATE (w:WorkPlace {name:'RedisLabs'})"
+	q := "CREATE (w:WorkPlace {name:'FalkorDB'})"
 	_, err := graph.ROQuery(q)
 	assert.NotNil(t, err, "error should not be nil")
 }
diff --git a/example_graph_test.go b/example_graph_test.go
index 0ce0d46..0e78eaf 100644
--- a/example_graph_test.go
+++ b/example_graph_test.go
@@ -6,12 +6,12 @@ import (
 	"github.com/FalkorDB/falkordb-go"
 )
 
-func ExampleGraphNew() {
+func ExampleSelectGraph() {
 	db, _ := falkordb.FalkorDBNew("0.0.0.0:6379", &falkordb.ConnectionOption{})
 
 	graph := db.SelectGraph("social")
 
-	q := "CREATE (w:WorkPlace {name:'RedisLabs'}) RETURN w"
+	q := "CREATE (w:WorkPlace {name:'FalkorDB'}) RETURN w"
 	res, _ := graph.Query(q)
 
 	res.Next()
@@ -73,7 +73,7 @@ func ExampleGraphNew() {
 
 // 	graph := falkordb.GraphNew("social", pool.Get())
 
-// 	q := "CREATE (w:WorkPlace {name:'RedisLabs'}) RETURN w"
+// 	q := "CREATE (w:WorkPlace {name:'FalkorDB'}) RETURN w"
 // 	res, _ := graph.Query(q)
 
 // 	res.Next()
diff --git a/examples/falkordb_tls_client/falkordb_tls_client.go b/examples/falkordb_tls_client/falkordb_tls_client.go
index 459de81..056b532 100644
--- a/examples/falkordb_tls_client/falkordb_tls_client.go
+++ b/examples/falkordb_tls_client/falkordb_tls_client.go
@@ -12,11 +12,11 @@ import (
 )
 
 var (
-	tlsCertFile   = flag.String("tls-cert-file", "redis.crt", "A a X.509 certificate to use for authenticating the  server to connected clients, masters or cluster peers. The file should be PEM formatted.")
-	tlsKeyFile    = flag.String("tls-key-file", "redis.key", "A a X.509 privat ekey to use for authenticating the  server to connected clients, masters or cluster peers. The file should be PEM formatted.")
+	tlsCertFile   = flag.String("tls-cert-file", "falkordb.crt", "A a X.509 certificate to use for authenticating the server to connected clients, masters or cluster peers. The file should be PEM formatted.")
+	tlsKeyFile    = flag.String("tls-key-file", "falkordb.key", "A a X.509 privat ekey to use for authenticating the server to connected clients, masters or cluster peers. The file should be PEM formatted.")
 	tlsCaCertFile = flag.String("tls-ca-cert-file", "ca.crt", "A PEM encoded CA's certificate file.")
-	host          = flag.String("host", "127.0.0.1:6379", "Redis host.")
-	password      = flag.String("password", "", "Redis password.")
+	host          = flag.String("host", "127.0.0.1:6379", "FalkorDB host.")
+	password      = flag.String("password", "", "FalkorDB password.")
 )
 
 func exists(filename string) (exists bool) {
@@ -30,7 +30,7 @@ func exists(filename string) (exists bool) {
 }
 
 /*
- * Example of how to establish an SSL connection from your app to the RedisAI Server
+ * Example of how to establish an SSL connection from your app to the FalkorDB Server
  */
 func main() {
 	flag.Parse()
@@ -74,7 +74,7 @@ func main() {
 
 	graph := db.SelectGraph("social")
 
-	q := "CREATE (w:WorkPlace {name:'RedisLabs'}) RETURN w"
+	q := "CREATE (w:WorkPlace {name:'FalkorDB'}) RETURN w"
 	res, _ := graph.Query(q)
 
 	res.Next()