diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index a7a04be639..bfdc08ab4c 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -812,7 +812,7 @@ def compare_context_objects(newconf, running):
                 delete_bgpd = True
                 lines_to_del.append((running_ctx_keys, None))
 
-            # We cannot do 'no interface' in quagga, and so deal with it
+            # We cannot do 'no interface' in FRR, and so deal with it
             elif running_ctx_keys[0].startswith('interface'):
                 for line in running_ctx.lines:
                     lines_to_del.append((running_ctx_keys, line))
@@ -1010,7 +1010,7 @@ if __name__ == '__main__':
         # the "neighbor 1.1.1.1 route-map FOO out" line...so we compare the
         # configs again to put this line back.
 
-        # There are many keywords in quagga that can only appear one time under
+        # There are many keywords in FRR that can only appear one time under
         # a context, take "bgp router-id" for example. If the config that we are
         # reloading against has the following:
         #
@@ -1038,7 +1038,7 @@ if __name__ == '__main__':
                 lines_to_add.extend(lines_to_add_first_pass)
 
             # Only do deletes on the first pass. The reason being if we
-            # configure a bgp neighbor via "neighbor swp1 interface" quagga
+            # configure a bgp neighbor via "neighbor swp1 interface" FRR
             # will automatically add:
             #
             # interface swp1
diff --git a/tools/multiple-bgpd.sh b/tools/multiple-bgpd.sh
index 20a92a9160..6dee1bafc3 100644
--- a/tools/multiple-bgpd.sh
+++ b/tools/multiple-bgpd.sh
@@ -10,8 +10,8 @@ PREFIX=192.168.145.
 #PREFIX=3ffe:123:456::
 ADDRPLEN=32
 CONFBASE=/tmp
-PIDBASE=/var/run/quagga
-CHOWNSTR=quagga:quagga
+PIDBASE=/var/run/frr
+CHOWNSTR=frr:frr
 
 for H in `seq 1 ${NUM}` ; do
 	CONF="${CONFBASE}"/bgpd${H}.conf
diff --git a/tools/vty_index.cocci b/tools/vty_index.cocci
index 8290e80b91..eabbaa1aa5 100644
--- a/tools/vty_index.cocci
+++ b/tools/vty_index.cocci
@@ -141,7 +141,7 @@ fn << rule11.fn;
 @@
 print "R11 removing vty-index argument on %s(...)" % (fn)
 
-#/* find type of the argument - note args are mostly unnamed in Quagga :( */
+#/* find type of the argument - note args are mostly unnamed in FRR :( */
 @ rule12 @
 identifier rule11.fn;
 identifier T, argname;