diff --git a/configure.ac b/configure.ac
index b926870..c4b7701 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,7 +409,7 @@ AC_OUTPUT([
   lib/xlib/Makefile
   lib/xwidgets/Makefile
   lib/xwidgets/xaw/Makefile
-  lib/xwidgets/motif/Makefile
+  lib/xwidgets/xm/Makefile
   scm/Makefile
   scm/slib.scm
   src/Makefile
diff --git a/lib/xwidgets/Makefile.am b/lib/xwidgets/Makefile.am
index d0f9c51..ac5467f 100644
--- a/lib/xwidgets/Makefile.am
+++ b/lib/xwidgets/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = xaw motif
+SUBDIRS = xaw xm
 
 NULL = 
 
@@ -6,17 +6,17 @@ include ../xlib/Include.am
 
 EXTRA_DIST = MISSING mkwidget.scm
 
-pkglib_LTLIBRARIES = xaw.la motif.la
+pkglib_LTLIBRARIES = xaw.la xm.la
 
 xaw_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
 xaw_la_CFLAGS = -I$(srcdir)/../xlib @XAW_CFLAGS@
 xaw_la_LDFLAGS = -module -avoid-version
 xaw_la_LIBADD = $(top_builddir)/src/libelk.la @XAW_LIBS@
 
-motif_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
-motif_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@
-motif_la_LDFLAGS = -module -avoid-version
-motif_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
+xm_la_SOURCES = $(SOURCES_XT) $(SOURCES_XLIB)
+xm_la_CFLAGS = -I$(srcdir)/../xlib @XM_CFLAGS@
+xm_la_LDFLAGS = -module -avoid-version
+xm_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
 
 extensions_HEADERS = xt.h
 extensionsdir = $(pkgincludedir)/extensions
diff --git a/lib/xwidgets/mkwidget.scm b/lib/xwidgets/mkwidget.scm
index 34bac4f..e8735cb 100644
--- a/lib/xwidgets/mkwidget.scm
+++ b/lib/xwidgets/mkwidget.scm
@@ -24,13 +24,13 @@
     (set! type-name name)
     (format f "#include \"../xt.h\"~%")
     (case widget-set
-      (motif
+      (xm
 	(format f "#include <Xm/Xm.h>~%")))
     (if (and (not (eqv? include "")) (not (null? include)))
 	(begin
 	  (define dir)
 	  (case widget-set
-	    (motif
+	    (xm
 	     (set! dir "Xm"))
 	    (xaw
 	     (set! dir "X11/Xaw")))
diff --git a/lib/xwidgets/motif/ALIASES b/lib/xwidgets/xm/ALIASES
similarity index 100%
rename from lib/xwidgets/motif/ALIASES
rename to lib/xwidgets/xm/ALIASES
diff --git a/lib/xwidgets/motif/Makefile.am b/lib/xwidgets/xm/Makefile.am
similarity index 75%
rename from lib/xwidgets/motif/Makefile.am
rename to lib/xwidgets/xm/Makefile.am
index 07655bf..cdb6a9a 100644
--- a/lib/xwidgets/motif/Makefile.am
+++ b/lib/xwidgets/xm/Makefile.am
@@ -2,15 +2,15 @@ NULL =
 
 EXTRA_DIST = $(D_FILES)
 
-pkglib_LTLIBRARIES = motif-widgets.la
+pkglib_LTLIBRARIES = xm-widgets.la
 
-nodist_motif_widgets_la_SOURCES = $(C_FILES)
-motif_widgets_la_CFLAGS = -I$(srcdir)/../../xlib @XM_CFLAGS@
-motif_widgets_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning
-motif_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
+nodist_xm_widgets_la_SOURCES = $(C_FILES)
+xm_widgets_la_CFLAGS = -I$(srcdir)/../../xlib @XM_CFLAGS@
+xm_widgets_la_LDFLAGS = -module -avoid-version -u XmIsMotifWMRunning
+xm_widgets_la_LIBADD = $(top_builddir)/src/libelk.la @XM_LIBS@
 
 .d.c:
-	$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/.. -l mkwidget.scm $< $@ motif
+	$(top_builddir)/src/elk -p .:$(top_srcdir)/scm:$(srcdir)/.. -l mkwidget.scm $< $@ xm
 
 clean: clean-local
 clean-local:
diff --git a/lib/xwidgets/motif/arrow-button.d b/lib/xwidgets/xm/arrow-button.d
similarity index 100%
rename from lib/xwidgets/motif/arrow-button.d
rename to lib/xwidgets/xm/arrow-button.d
diff --git a/lib/xwidgets/motif/bulletin-brd.d b/lib/xwidgets/xm/bulletin-brd.d
similarity index 100%
rename from lib/xwidgets/motif/bulletin-brd.d
rename to lib/xwidgets/xm/bulletin-brd.d
diff --git a/lib/xwidgets/motif/cascade-btn.d b/lib/xwidgets/xm/cascade-btn.d
similarity index 100%
rename from lib/xwidgets/motif/cascade-btn.d
rename to lib/xwidgets/xm/cascade-btn.d
diff --git a/lib/xwidgets/motif/command.d b/lib/xwidgets/xm/command.d
similarity index 100%
rename from lib/xwidgets/motif/command.d
rename to lib/xwidgets/xm/command.d
diff --git a/lib/xwidgets/motif/drawing-area.d b/lib/xwidgets/xm/drawing-area.d
similarity index 100%
rename from lib/xwidgets/motif/drawing-area.d
rename to lib/xwidgets/xm/drawing-area.d
diff --git a/lib/xwidgets/motif/drawn-button.d b/lib/xwidgets/xm/drawn-button.d
similarity index 100%
rename from lib/xwidgets/motif/drawn-button.d
rename to lib/xwidgets/xm/drawn-button.d
diff --git a/lib/xwidgets/motif/file-selectn.d b/lib/xwidgets/xm/file-selectn.d
similarity index 100%
rename from lib/xwidgets/motif/file-selectn.d
rename to lib/xwidgets/xm/file-selectn.d
diff --git a/lib/xwidgets/motif/form.d b/lib/xwidgets/xm/form.d
similarity index 100%
rename from lib/xwidgets/motif/form.d
rename to lib/xwidgets/xm/form.d
diff --git a/lib/xwidgets/motif/frame.d b/lib/xwidgets/xm/frame.d
similarity index 100%
rename from lib/xwidgets/motif/frame.d
rename to lib/xwidgets/xm/frame.d
diff --git a/lib/xwidgets/motif/label.d b/lib/xwidgets/xm/label.d
similarity index 100%
rename from lib/xwidgets/motif/label.d
rename to lib/xwidgets/xm/label.d
diff --git a/lib/xwidgets/motif/list.d b/lib/xwidgets/xm/list.d
similarity index 100%
rename from lib/xwidgets/motif/list.d
rename to lib/xwidgets/xm/list.d
diff --git a/lib/xwidgets/motif/main-window.d b/lib/xwidgets/xm/main-window.d
similarity index 100%
rename from lib/xwidgets/motif/main-window.d
rename to lib/xwidgets/xm/main-window.d
diff --git a/lib/xwidgets/motif/message-box.d b/lib/xwidgets/xm/message-box.d
similarity index 100%
rename from lib/xwidgets/motif/message-box.d
rename to lib/xwidgets/xm/message-box.d
diff --git a/lib/xwidgets/motif/paned-window.d b/lib/xwidgets/xm/paned-window.d
similarity index 100%
rename from lib/xwidgets/motif/paned-window.d
rename to lib/xwidgets/xm/paned-window.d
diff --git a/lib/xwidgets/motif/push-button.d b/lib/xwidgets/xm/push-button.d
similarity index 100%
rename from lib/xwidgets/motif/push-button.d
rename to lib/xwidgets/xm/push-button.d
diff --git a/lib/xwidgets/motif/row-column.d b/lib/xwidgets/xm/row-column.d
similarity index 100%
rename from lib/xwidgets/motif/row-column.d
rename to lib/xwidgets/xm/row-column.d
diff --git a/lib/xwidgets/motif/scale.d b/lib/xwidgets/xm/scale.d
similarity index 100%
rename from lib/xwidgets/motif/scale.d
rename to lib/xwidgets/xm/scale.d
diff --git a/lib/xwidgets/motif/scroll-bar.d b/lib/xwidgets/xm/scroll-bar.d
similarity index 100%
rename from lib/xwidgets/motif/scroll-bar.d
rename to lib/xwidgets/xm/scroll-bar.d
diff --git a/lib/xwidgets/motif/scrolled-win.d b/lib/xwidgets/xm/scrolled-win.d
similarity index 100%
rename from lib/xwidgets/motif/scrolled-win.d
rename to lib/xwidgets/xm/scrolled-win.d
diff --git a/lib/xwidgets/motif/selectn-box.d b/lib/xwidgets/xm/selectn-box.d
similarity index 100%
rename from lib/xwidgets/motif/selectn-box.d
rename to lib/xwidgets/xm/selectn-box.d
diff --git a/lib/xwidgets/motif/separator.d b/lib/xwidgets/xm/separator.d
similarity index 100%
rename from lib/xwidgets/motif/separator.d
rename to lib/xwidgets/xm/separator.d
diff --git a/lib/xwidgets/motif/shell.d b/lib/xwidgets/xm/shell.d
similarity index 100%
rename from lib/xwidgets/motif/shell.d
rename to lib/xwidgets/xm/shell.d
diff --git a/lib/xwidgets/motif/support.d b/lib/xwidgets/xm/support.d
similarity index 100%
rename from lib/xwidgets/motif/support.d
rename to lib/xwidgets/xm/support.d
diff --git a/lib/xwidgets/motif/text.d b/lib/xwidgets/xm/text.d
similarity index 100%
rename from lib/xwidgets/motif/text.d
rename to lib/xwidgets/xm/text.d
diff --git a/lib/xwidgets/motif/toggle-btn.d b/lib/xwidgets/xm/toggle-btn.d
similarity index 100%
rename from lib/xwidgets/motif/toggle-btn.d
rename to lib/xwidgets/xm/toggle-btn.d