diff --git a/include/maxscale/backend.hh b/include/maxscale/backend.hh
index 484f31a6c..d3e8d6167 100644
--- a/include/maxscale/backend.hh
+++ b/include/maxscale/backend.hh
@@ -98,7 +98,7 @@ public:
      *
      * @return True if there are session commands waiting to be executed
      */
-    inline bool have_session_commands() const
+    inline bool has_session_commands() const
     {
         return !m_session_commands.empty();
     }
diff --git a/server/core/backend.cc b/server/core/backend.cc
index 8bfe0f9af..d83f84106 100644
--- a/server/core/backend.cc
+++ b/server/core/backend.cc
@@ -80,7 +80,7 @@ void Backend::close(close_type type)
 
 bool Backend::execute_session_command()
 {
-    if (is_closed() || !have_session_commands())
+    if (is_closed() || !has_session_commands())
     {
         return false;
     }
@@ -150,7 +150,7 @@ size_t Backend::session_command_count() const
 
 const SSessionCommand& Backend::next_session_command() const
 {
-    ss_dassert(have_session_commands());
+    ss_dassert(has_session_commands());
     return m_session_commands.front();
 }
 
diff --git a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
index 1d82d2922..3abf9e190 100644
--- a/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
@@ -217,7 +217,7 @@ bool RWSplitSession::route_single_stmt(GWBUF *querybuf, const RouteInfo& info)
                 // The connection to target was down and we failed to reconnect
                 succp = false;
             }
-            else if (target->have_session_commands())
+            else if (target->has_session_commands())
             {
                 // We need to wait until the session commands are executed
                 m_expected_responses++;
@@ -940,7 +940,7 @@ bool RWSplitSession::handle_got_target(GWBUF* querybuf, SRWBackend& target, bool
              target->uri());
 
     /** The session command cursor must not be active */
-    ss_dassert(!target->have_session_commands());
+    ss_dassert(!target->has_session_commands());
 
     mxs::Backend::response_type response = mxs::Backend::NO_RESPONSE;
     m_wait_gtid_state = EXPECTING_NOTHING;
diff --git a/server/modules/routing/readwritesplit/rwsplit_session_cmd.cc b/server/modules/routing/readwritesplit/rwsplit_session_cmd.cc
index 88531c180..a80595d0f 100644
--- a/server/modules/routing/readwritesplit/rwsplit_session_cmd.cc
+++ b/server/modules/routing/readwritesplit/rwsplit_session_cmd.cc
@@ -69,7 +69,7 @@ static void discard_if_response_differs(SRWBackend backend, uint8_t master_cmd,
 
 void RWSplitSession::process_sescmd_response(SRWBackend& backend, GWBUF** ppPacket)
 {
-    if (backend->have_session_commands())
+    if (backend->has_session_commands())
     {
         /** We are executing a session command */
         if (GWBUF_IS_TYPE_SESCMD_RESPONSE((*ppPacket)))
diff --git a/server/modules/routing/readwritesplit/rwsplitsession.cc b/server/modules/routing/readwritesplit/rwsplitsession.cc
index 141d49171..4353fed45 100644
--- a/server/modules/routing/readwritesplit/rwsplitsession.cc
+++ b/server/modules/routing/readwritesplit/rwsplitsession.cc
@@ -457,13 +457,13 @@ void RWSplitSession::clientReply(GWBUF *writebuf, DCB *backend_dcb)
                  m_expected_responses, backend->name());
     }
 
-    if (backend->have_session_commands())
+    if (backend->has_session_commands())
     {
         /** Reply to an executed session command */
         process_sescmd_response(backend, &writebuf);
     }
 
-    if (backend->have_session_commands())
+    if (backend->has_session_commands())
     {
         if (backend->execute_session_command())
         {
@@ -675,7 +675,7 @@ bool RWSplitSession::handle_error_new_connection(DCB *backend_dcb, GWBUF *errmsg
              */
             gwbuf_free(stored);
 
-            if (!backend->have_session_commands())
+            if (!backend->has_session_commands())
             {
                 /**
                  * The backend was executing a command that requires a reply.
diff --git a/server/modules/routing/schemarouter/schemaroutersession.cc b/server/modules/routing/schemarouter/schemaroutersession.cc
index 78540a802..5ecab8c85 100644
--- a/server/modules/routing/schemarouter/schemaroutersession.cc
+++ b/server/modules/routing/schemarouter/schemaroutersession.cc
@@ -431,7 +431,7 @@ int32_t SchemaRouterSession::routeQuery(GWBUF* pPacket)
 
         MXS_INFO("Route query to \t%s:%d <", bref->backend()->server->name, bref->backend()->server->port);
 
-        if (bref->have_session_commands())
+        if (bref->has_session_commands())
         {
             /** Store current statement if execution of the previous
              * session command hasn't been completed. */
@@ -490,7 +490,7 @@ void SchemaRouterSession::handle_mapping_reply(SSRBackend& bref, GWBUF** pPacket
 
 void SchemaRouterSession::process_sescmd_response(SSRBackend& bref, GWBUF** ppPacket)
 {
-    if (bref->have_session_commands())
+    if (bref->has_session_commands())
     {
         /** We are executing a session command */
         if (GWBUF_IS_TYPE_SESCMD_RESPONSE((*ppPacket)))