diff --git a/.gitignore b/.gitignore
index 11d23daf..719054d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,7 +66,7 @@ weston-nested-client
 weston-presentation-shm
 weston-resizor
 weston-scaler
-weston-simple-dmabuf
+weston-simple-dmabuf-intel
 weston-simple-egl
 weston-simple-shm
 weston-simple-touch
diff --git a/Makefile.am b/Makefile.am
index cbb3b579..1eb66aeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -523,18 +523,18 @@ weston_simple_egl_CFLAGS = $(AM_CFLAGS) $(SIMPLE_EGL_CLIENT_CFLAGS)
 weston_simple_egl_LDADD = $(SIMPLE_EGL_CLIENT_LIBS) -lm
 endif
 
-if BUILD_SIMPLE_INTEL_DMABUF_CLIENT
-demo_clients += weston-simple-dmabuf
-weston_simple_dmabuf_SOURCES = clients/simple-dmabuf.c
-nodist_weston_simple_dmabuf_SOURCES =		\
+if BUILD_SIMPLE_DMABUF_INTEL_CLIENT
+demo_clients += weston-simple-dmabuf-intel
+weston_simple_dmabuf_intel_SOURCES = clients/simple-dmabuf-intel.c
+nodist_weston_simple_dmabuf_intel_SOURCES =		\
 	protocol/xdg-shell-unstable-v5-protocol.c		\
 	protocol/xdg-shell-unstable-v5-client-protocol.h	\
 	protocol/fullscreen-shell-unstable-v1-protocol.c	\
 	protocol/fullscreen-shell-unstable-v1-client-protocol.h \
 	protocol/linux-dmabuf-unstable-v1-protocol.c \
 	protocol/linux-dmabuf-unstable-v1-client-protocol.h
-weston_simple_dmabuf_CFLAGS = $(AM_CFLAGS) $(SIMPLE_DMABUF_CLIENT_CFLAGS)
-weston_simple_dmabuf_LDADD = $(SIMPLE_DMABUF_CLIENT_LIBS) libshared.la
+weston_simple_dmabuf_intel_CFLAGS = $(AM_CFLAGS) $(SIMPLE_DMABUF_INTEL_CLIENT_CFLAGS)
+weston_simple_dmabuf_intel_LDADD = $(SIMPLE_DMABUF_INTEL_CLIENT_LIBS) libshared.la
 BUILT_SOURCES += protocol/linux-dmabuf-unstable-v1-client-protocol.h
 endif
 
diff --git a/clients/simple-dmabuf.c b/clients/simple-dmabuf-intel.c
similarity index 100%
rename from clients/simple-dmabuf.c
rename to clients/simple-dmabuf-intel.c
diff --git a/configure.ac b/configure.ac
index bba80500..24a9de22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,19 +342,19 @@ if test x$enable_simple_egl_clients = xyes; then
                     [egl glesv2 wayland-client wayland-egl wayland-cursor])
 fi
 
-AC_ARG_ENABLE(simple-intel-dmabuf-client,
-              AS_HELP_STRING([--disable-simple-intel-dmabuf-client],
-                             [do not build the simple intel dmabuf client]),,
-              enable_simple_intel_dmabuf_client="auto")
-if ! test "x$enable_simple_intel_dmabuf_client" = "xno"; then
-  PKG_CHECK_MODULES(SIMPLE_DMABUF_CLIENT, [wayland-client libdrm libdrm_intel],
-		    have_simple_dmabuf_client=yes, have_simple_dmabuf_client=no)
-  if test "x$have_simple_dmabuf_client" = "xno" -a "x$enable_simple_intel_dmabuf_client" = "xyes"; then
+AC_ARG_ENABLE(simple-dmabuf-intel-client,
+              AS_HELP_STRING([--disable-simple-dmabuf-intel-client],
+                             [do not build the simple dmabuf intel client]),,
+              enable_simple_dmabuf_intel_client="auto")
+if ! test "x$enable_simple_dmabuf_intel_client" = "xno"; then
+  PKG_CHECK_MODULES(SIMPLE_DMABUF_INTEL_CLIENT, [wayland-client libdrm libdrm_intel],
+		    have_simple_dmabuf_intel_client=yes, have_simple_dmabuf_intel_client=no)
+  if test "x$have_simple_dmabuf_intel_client" = "xno" -a "x$enable_simple_dmabuf_intel_client" = "xyes"; then
     AC_MSG_ERROR([Intel dmabuf client explicitly enabled, but libdrm_intel couldn't be found])
   fi
-  enable_simple_intel_dmabuf_client="$have_simple_dmabuf_client"
+  enable_simple_dmabuf_intel_client="$have_simple_dmabuf_intel_client"
 fi
-AM_CONDITIONAL(BUILD_SIMPLE_INTEL_DMABUF_CLIENT, test "x$enable_simple_intel_dmabuf_client" = "xyes")
+AM_CONDITIONAL(BUILD_SIMPLE_DMABUF_INTEL_CLIENT, test "x$enable_simple_dmabuf_intel_client" = "xyes")
 
 AC_ARG_ENABLE(clients, [  --enable-clients],, enable_clients=yes)
 AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes)