diff --git a/04-databases/basic-blog/CommentRoutines.m b/04-databases/basic-blog/CommentRoutines.m
index 9561529..7b148e3 100644
--- a/04-databases/basic-blog/CommentRoutines.m
+++ b/04-databases/basic-blog/CommentRoutines.m
@@ -1,25 +1,25 @@
 
-fetchByComment(idComment,data)
+fetch(id,data)
   n record
   k data
-  i idComment="" q 0
+  i id="" q 0
   s lev1=""
   s lev2=""
   f  s lev1=$o(^comments(lev1)) q:lev1=""  d
   . f  s lev2=$o(^comments(lev1,lev2)) q:lev2=""  d
-  . . i lev1=idComment d
-  . . . s record=$get(^comments(idComment,lev2))
+  . . i lev1=id d
+  . . . s record=$get(^comments(id,lev2))
   . . . s data("description")=$piece(record,"~",1)
   . . . q
   q
 
-set(idComment,idPost,data)
-  i idComment=""!idPost="" q 0
+set(id,idPost,data)
+  i id=""!idPost="" q 0
   s description=$piece(data,"~",1)
-  s ^comments(idComment,idPost)=description
+  s ^comments(id,idPost)=description
   q 1
 
-remove(n)
-  i n="" q 0
-  k ^comments(n)
+remove(id)
+  i id="" q 0
+  k ^comments(id)
   q 1
diff --git a/04-databases/basic-blog/Main.m b/04-databases/basic-blog/Main.m
index 9c7de43..cf410d8 100644
--- a/04-databases/basic-blog/Main.m
+++ b/04-databases/basic-blog/Main.m
@@ -18,14 +18,14 @@
 
 ; fetch posts by post
 
-  do fetchByPost^PostRoutines(1,.data)
-  w "Post fetched by post:",!
+  do fetch^PostRoutines(1,.data)
+  w "Post fetched:",!
   w "slug: ",data("slug"),!
   w "title: ",data("title"),!
   w "description: ",data("description"),!
 
-  do fetchByPost^PostRoutines(2,.data)
-  w !,"Post fetched by post:",!
+  do fetch^PostRoutines(2,.data)
+  w !,"Post fetched:",!
   w "slug: ",data("slug"),!
   w "title: ",data("title"),!
   w "description: ",data("description"),!
@@ -39,12 +39,12 @@
 
 ; fetch comments
 
-  do fetchByComment^CommentRoutines(1,.data)
-  w !,"Comment fetched by comment:",!
+  do fetch^CommentRoutines(1,.data)
+  w !,"Comment fetched:",!
   w "description: ",data("description"),!
 
-  do fetchByComment^CommentRoutines(2,.data)
-  w !,"Comment fetched by comment:",!
+  do fetch^CommentRoutines(2,.data)
+  w !,"Comment fetched:",!
   w "description: ",data("description"),!
 
 ; drop database
diff --git a/04-databases/basic-blog/PostRoutines.m b/04-databases/basic-blog/PostRoutines.m
index 5467770..ee0efc9 100644
--- a/04-databases/basic-blog/PostRoutines.m
+++ b/04-databases/basic-blog/PostRoutines.m
@@ -1,14 +1,14 @@
 
-fetchByPost(idPost,data)
+fetch(id,data)
   n record
   k data
-  i idPost="" q 0
+  i id="" q 0
   s lev1=""
   s lev2=""
   f  s lev1=$o(^posts(lev1)) q:lev1=""  d
   . f  s lev2=$o(^posts(lev1,lev2)) q:lev2=""  d
-  . . i lev1=idPost d
-  . . . s record=$get(^posts(idPost,lev2))
+  . . i lev1=id d
+  . . . s record=$get(^posts(id,lev2))
   . . . s data("slug")=$piece(record,"~",1)
   . . . s data("title")=$piece(record,"~",2)
   . . . s data("description")=$piece(record,"~",3)
@@ -28,15 +28,15 @@ fetchByUser(idUser,data)
   . . . s count=count+1
   q
 
-set(idPost,idUser,data)
-  i idPost=""!idUser="" q 0
+set(id,idUser,data)
+  i id=""!idUser="" q 0
   s slug=$piece(data,"~",1)
   s title=$piece(data,"~",2)
   s description=$piece(data,"~",3)
-  s ^posts(idPost,idUser)=slug_"~"_title_"~"_description
+  s ^posts(id,idUser)=slug_"~"_title_"~"_description
   q 1
 
-remove(n)
-  i n="" q 0
-  k ^posts(n)
+remove(id)
+  i id="" q 0
+  k ^posts(id)
   q 1
diff --git a/04-databases/basic-blog/UserRoutines.m b/04-databases/basic-blog/UserRoutines.m
index 82e71ef..4da0c92 100644
--- a/04-databases/basic-blog/UserRoutines.m
+++ b/04-databases/basic-blog/UserRoutines.m
@@ -1,25 +1,25 @@
 
-fetch(n,data)
+fetch(id,data)
   n record
   k data
-  i n="" q 0
-  s record=$get(^users(n))
+  i id="" q 0
+  s record=$get(^users(id))
   s data("username")=$piece(record,"~",1)
   s data("password")=$piece(record,"~",2)
   s data("email")=$piece(record,"~",3)
   s data("fullname")=$piece(record,"~",4)
   q 1
 
-set(n,data)
-  i n="" q 0
+set(id,data)
+  i id="" q 0
   s username=$piece(data,"~",1)
   s password=$piece(data,"~",2)
   s email=$piece(data,"~",3)
   s fullname=$piece(data,"~",4)
-  s ^users(n)=username_"~"_password_"~"_email_"~"_fullname
+  s ^users(id)=username_"~"_password_"~"_email_"~"_fullname
   q 1
 
-remove(n)
-  i n="" q 0
-  k ^users(n)
+remove(id)
+  i id="" q 0
+  k ^users(id)
   q 1
diff --git a/README.md b/README.md
index 43a1063..e29957b 100644
--- a/README.md
+++ b/README.md
@@ -229,12 +229,12 @@ For further details also visit:
 
 ### [`basic-blog/Main.m`](https://github.com/programarivm/mumps-examples/blob/master/04-databases/basic-blog/Main.m)
 
-    Post fetched by post:
+    Post fetched:
     slug: lorem-ipsum
     title: Lorem ipsum
     description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
 
-    Post fetched by post:
+    Post fetched:
     slug: donec-pede-justo
     title: Donec pede justo
     description: Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu.
@@ -243,10 +243,10 @@ For further details also visit:
     lorem-ipsum~Lorem ipsum~Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
     donec-pede-justo~Donec pede justo~Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu.
 
-    Comment fetched by comment:
+    Comment fetched:
     description: This is awesome! Thank you.
 
-    Comment fetched by comment:
+    Comment fetched:
     description: Thank you so much for sharing this.
 
     Database successfully dropped!