diff --git a/doc/sphinx/book/connectors/__java.rst b/doc/sphinx/book/connectors/__java.rst
index a5ecb509895577aa687b4b410a61ca090110fefc..f55542e42c4d01ee87b95b91da1541a0fbef95a7 100644
--- a/doc/sphinx/book/connectors/__java.rst
+++ b/doc/sphinx/book/connectors/__java.rst
@@ -2,4 +2,4 @@
                             Java
 =====================================================================
 
-Please, see http://dgreenru.github.io/tarantool-java/.
+See http://github.com/tarantool/tarantool-java/.
diff --git a/doc/www/content/newsite/download.yml.in b/doc/www/content/newsite/download.yml.in
index 19163858de2f79a6339d778c0495c970a534efec..ae3f6dd771b02b1f93281493d44d38e9a16308ca 100644
--- a/doc/www/content/newsite/download.yml.in
+++ b/doc/www/content/newsite/download.yml.in
@@ -141,13 +141,13 @@ blocks :
           - Ruby driver,       `<https://github.com/funny-falcon/tarantool16-ruby>`_
           - Perl driver,       `DR:Tarantool`_
           - C connector        `<https://github.com/tarantool/tarantool-c>`_
-          - node.js driver,    `<https://github.com/devgru/node-tarantool>`_
+          - node.js driver,    `<https://github.com/KlonD90/node-tarantool-driver>`_
           - Erlang driver,     `<https://github.com/rtsisyk/etarantool>`_
-          - Go driver,         `<https://github.com/fl00r/go-tarantool>`_
+          - Go driver,         `<https://github.com/mialinx/go-tarantool-1.6>`_
           - Lua-nginx driver,  `<https://github.com/ziontab/lua-nginx-tarantool>`_
 
           .. _DR\:Tarantool:    http://search.cpan.org/~unera/DR-Tarantool-0.42/lib/DR/Tarantool.pm
-          .. _Maven repository: http://dgreenru.github.com/tarantool-java
+          .. _Maven repository: http://github.com/tarantool/tarantool-java
     - - "Source tarball"
       - format : rst
         content: |
diff --git a/src/box/iproto_constants.c b/src/box/iproto_constants.c
index 463e732ddc59c80da3f1176aa6001bf6c9c6834f..5ccd0f4bf4e0fa00ea0762154948909bd8ead6fa 100644
--- a/src/box/iproto_constants.c
+++ b/src/box/iproto_constants.c
@@ -150,9 +150,9 @@ const char *iproto_key_strs[IPROTO_KEY_MAX] = {
 	"tuple",            /* 0x21 */
 	"function name",    /* 0x22 */
 	"user name",        /* 0x23 */
-	"server UUID"       /* 0x24 */
-	"cluster UUID"      /* 0x25 */
-	"vector clock"      /* 0x26 */
-	"expr"              /* 0x27 */
+	"server UUID",      /* 0x24 */
+	"cluster UUID",     /* 0x25 */
+	"vector clock",     /* 0x26 */
+	"expression",       /* 0x27 */
 };