diff --git a/Makefile.am b/Makefile.am
index 4a10556af42e8985e383ab62d60bf9e3527821a6..c7d2e636231bb68e9a463fe38c5c01c0a37de9c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = prepare.sh
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS   = 
-AM_CXXFLAGS = $(AM_CFLAGS)
+AM_CXXFLAGS = -std=c++14 $(AM_CFLAGS)
 
 SERVER_LIBS = @SERVER_LIBS@
 CLIENT_LIBS = @CLIENT_LIBS@
diff --git a/configure.ac b/configure.ac
index 611a43925bb446def85f051242ace3e453d3c498..a5e5f2b46d496fe9e4bd91cae3a82ad784a980fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,7 @@ LT_INIT([dlopen])
 # checks for programs
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_PROG_CXX
 AC_PROG_INSTALL
 
 # checks for libraires
diff --git a/src/server/exec-read-op.c b/src/server/print-read-op.c
similarity index 100%
rename from src/server/exec-read-op.c
rename to src/server/print-read-op.c
diff --git a/src/server/exec-read-op.h b/src/server/print-read-op.h
similarity index 100%
rename from src/server/exec-read-op.h
rename to src/server/print-read-op.h
diff --git a/src/server/exec-write-op.c b/src/server/print-write-op.c
similarity index 100%
rename from src/server/exec-write-op.c
rename to src/server/print-write-op.c
diff --git a/src/server/exec-write-op.h b/src/server/print-write-op.h
similarity index 100%
rename from src/server/exec-write-op.h
rename to src/server/print-write-op.h