diff --git a/BlueSteel/.cvsignore b/BlueSteel/.cvsignore
index aa0bf32..8a4b34c 100644
--- a/BlueSteel/.cvsignore
+++ b/BlueSteel/.cvsignore
@@ -5,5 +5,5 @@ configure
 config.log
 config.status
 Makefile
-enlightenment-theme-*.tar.gz
+e16-theme-*.tar.gz
 files
diff --git a/BlueSteel/configure.in b/BlueSteel/configure.in
index 2f5139c..a44de64 100644
--- a/BlueSteel/configure.in
+++ b/BlueSteel/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(etheme-BlueSteel.spec)
 
-AM_INIT_AUTOMAKE(enlightenment-theme-BlueSteel, 0.16)
+AM_INIT_AUTOMAKE(e16-theme-BlueSteel, 0.16)
 AM_MAINTAINER_MODE
 
 THEME=BlueSteel
@@ -19,12 +19,12 @@ AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
 AC_ARG_ENABLE(fsstd,
-  [  --enable-fsstd          install files following FSSTD [default=no]], ,enable_fsstd=no)
+  [  --enable-fsstd          install files following FSSTD [default=yes]], ,enable_fsstd=yes)
 
 if test "x$enable_fsstd" != "xyes"; then
   datadir=${prefix}
 fi
-ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment`
+ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)
 
 THEME_FILES=`ls -1 $THEME.etheme*`
diff --git a/BlueSteel/etheme-BlueSteel.spec b/BlueSteel/etheme-BlueSteel.spec
index c029313..ad01971 100644
--- a/BlueSteel/etheme-BlueSteel.spec
+++ b/BlueSteel/etheme-BlueSteel.spec
@@ -1,7 +1,7 @@
 Summary:	Enlightenment theme: BlueSteel
-Name:		enlightenment-theme-BlueSteel
+Name:		e16-theme-BlueSteel
 Version:	0.16
-Release:	1
+Release:	0.%(date '+%y%m%d')
 License:	BSD
 Group:		User Interface/Desktops
 Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
@@ -10,8 +10,8 @@ BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 URL:		http://www.enlightenment.org/
 
-Requires: enlightenment >= 0.16.7
-Obsoletes: etheme-BlueSteel
+Requires: e16 >= 0.16.8
+Obsoletes: etheme-BlueSteel enlightenment-theme-BlueSteel
 
 %description
 The BlueSteel theme for Enlightenment.
@@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING INSTALL README
-%{_datadir}/enlightenment/*
+%{_datadir}/e16/*
 
 %changelog
 
diff --git a/BrushedMetal-Tigert/.cvsignore b/BrushedMetal-Tigert/.cvsignore
index aa0bf32..8a4b34c 100644
--- a/BrushedMetal-Tigert/.cvsignore
+++ b/BrushedMetal-Tigert/.cvsignore
@@ -5,5 +5,5 @@ configure
 config.log
 config.status
 Makefile
-enlightenment-theme-*.tar.gz
+e16-theme-*.tar.gz
 files
diff --git a/BrushedMetal-Tigert/configure.in b/BrushedMetal-Tigert/configure.in
index 08da027..004f49c 100644
--- a/BrushedMetal-Tigert/configure.in
+++ b/BrushedMetal-Tigert/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(etheme-BrushedMetal-Tigert.spec)
 
-AM_INIT_AUTOMAKE(enlightenment-theme-BrushedMetal-Tigert, 0.16)
+AM_INIT_AUTOMAKE(e16-theme-BrushedMetal-Tigert, 0.16)
 AM_MAINTAINER_MODE
 
 THEME=BrushedMetal-Tigert
@@ -19,12 +19,12 @@ AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
 AC_ARG_ENABLE(fsstd,
-  [  --enable-fsstd          install files following FSSTD [default=no]], ,enable_fsstd=no)
+  [  --enable-fsstd          install files following FSSTD [default=yes]], ,enable_fsstd=yes)
 
 if test "x$enable_fsstd" != "xyes"; then
   datadir=${prefix}
 fi
-ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment`
+ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)
 
 THEME_FILES=`ls -1 $THEME.etheme*`
diff --git a/BrushedMetal-Tigert/etheme-BrushedMetal-Tigert.spec b/BrushedMetal-Tigert/etheme-BrushedMetal-Tigert.spec
index e3db067..913d53d 100644
--- a/BrushedMetal-Tigert/etheme-BrushedMetal-Tigert.spec
+++ b/BrushedMetal-Tigert/etheme-BrushedMetal-Tigert.spec
@@ -1,7 +1,7 @@
 Summary:	Enlightenment theme: BrushedMetal-Tigert
-Name:		enlightenment-theme-BrushedMetal-Tigert
+Name:		e16-theme-BrushedMetal-Tigert
 Version:	0.16
-Release:	1
+Release:	0.%(date '+%y%m%d')
 License:	BSD
 Group:		User Interface/Desktops
 Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
@@ -10,8 +10,8 @@ BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 URL:		http://www.enlightenment.org/
 
-Requires: enlightenment >= 0.16.7
-Obsoletes: etheme-BrushedMetal-Tigert
+Requires: e16 >= 0.16.8
+Obsoletes: etheme-BrushedMetal-Tigert enlightenment-theme-BrushedMetal-Tigert
 
 %description
 The BrushedMetal-Tigert theme for Enlightenment.
@@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING INSTALL README
-%{_datadir}/enlightenment/*
+%{_datadir}/e16/*
 
 %changelog
 
diff --git a/Ganymede/.cvsignore b/Ganymede/.cvsignore
index aa0bf32..8a4b34c 100644
--- a/Ganymede/.cvsignore
+++ b/Ganymede/.cvsignore
@@ -5,5 +5,5 @@ configure
 config.log
 config.status
 Makefile
-enlightenment-theme-*.tar.gz
+e16-theme-*.tar.gz
 files
diff --git a/Ganymede/configure.in b/Ganymede/configure.in
index 19bba9d..198d47b 100644
--- a/Ganymede/configure.in
+++ b/Ganymede/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(etheme-Ganymede.spec)
 
-AM_INIT_AUTOMAKE(enlightenment-theme-Ganymede, 0.16)
+AM_INIT_AUTOMAKE(e16-theme-Ganymede, 0.16)
 AM_MAINTAINER_MODE
 
 THEME=Ganymede
@@ -19,12 +19,12 @@ AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
 AC_ARG_ENABLE(fsstd,
-  [  --enable-fsstd          install files following FSSTD [default=no]], ,enable_fsstd=no)
+  [  --enable-fsstd          install files following FSSTD [default=yes]], ,enable_fsstd=yes)
 
 if test "x$enable_fsstd" != "xyes"; then
   datadir=${prefix}
 fi
-ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment`
+ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)
 
 THEME_FILES=`ls -1 $THEME.etheme*`
diff --git a/Ganymede/etheme-Ganymede.spec b/Ganymede/etheme-Ganymede.spec
index 01fe747..1442454 100644
--- a/Ganymede/etheme-Ganymede.spec
+++ b/Ganymede/etheme-Ganymede.spec
@@ -1,7 +1,7 @@
 Summary:	Enlightenment theme: Ganymede
-Name:		enlightenment-theme-Ganymede
+Name:		e16-theme-Ganymede
 Version:	0.16
-Release:	1
+Release:	0.%(date '+%y%m%d')
 License:	BSD
 Group:		User Interface/Desktops
 Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
@@ -10,8 +10,8 @@ BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 URL:		http://www.enlightenment.org/
 
-Requires: enlightenment >= 0.16.7
-Obsoletes: etheme-Ganymede
+Requires: e16 >= 0.16.8
+Obsoletes: etheme-Ganymede enlightenment-theme-Ganymede
 
 %description
 The Ganymede theme for Enlightenment.
@@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING INSTALL README
-%{_datadir}/enlightenment/*
+%{_datadir}/e16/*
 
 %changelog
 
diff --git a/ShinyMetal/.cvsignore b/ShinyMetal/.cvsignore
index aa0bf32..8a4b34c 100644
--- a/ShinyMetal/.cvsignore
+++ b/ShinyMetal/.cvsignore
@@ -5,5 +5,5 @@ configure
 config.log
 config.status
 Makefile
-enlightenment-theme-*.tar.gz
+e16-theme-*.tar.gz
 files
diff --git a/ShinyMetal/configure.in b/ShinyMetal/configure.in
index f613a8c..e89ef3e2 100644
--- a/ShinyMetal/configure.in
+++ b/ShinyMetal/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(etheme-ShinyMetal.spec)
 
-AM_INIT_AUTOMAKE(enlightenment-theme-ShinyMetal, 0.16)
+AM_INIT_AUTOMAKE(e16-theme-ShinyMetal, 0.16)
 AM_MAINTAINER_MODE
 
 THEME=ShinyMetal
@@ -19,12 +19,12 @@ AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
 AC_ARG_ENABLE(fsstd,
-  [  --enable-fsstd          install files following FSSTD [default=no]], ,enable_fsstd=no)
+  [  --enable-fsstd          install files following FSSTD [default=yes]], ,enable_fsstd=yes)
 
 if test "x$enable_fsstd" != "xyes"; then
   datadir=${prefix}
 fi
-ENLIGHTENMENT_ROOT=`eval echo ${datadir}/enlightenment`
+ENLIGHTENMENT_ROOT=`eval echo ${datadir}/e16`
 AC_SUBST(ENLIGHTENMENT_ROOT)
 
 THEME_FILES=`ls -1 $THEME.etheme*`
diff --git a/ShinyMetal/etheme-ShinyMetal.spec b/ShinyMetal/etheme-ShinyMetal.spec
index e89ef3ec..557d1ac 100644
--- a/ShinyMetal/etheme-ShinyMetal.spec
+++ b/ShinyMetal/etheme-ShinyMetal.spec
@@ -1,7 +1,7 @@
 Summary:	Enlightenment theme: ShinyMetal
-Name:		enlightenment-theme-ShinyMetal
+Name:		e16-theme-ShinyMetal
 Version:	0.16
-Release:	1
+Release:	0.%(date '+%y%m%d')
 License:	BSD
 Group:		User Interface/Desktops
 Source0:	http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
@@ -10,8 +10,8 @@ BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 URL:		http://www.enlightenment.org/
 
-Requires: enlightenment >= 0.16.7
-Obsoletes: etheme-ShinyMetal
+Requires: e16 >= 0.16.8
+Obsoletes: etheme-ShinyMetal enlightenment-theme-ShinyMetal
 
 %description
 The ShinyMetal theme for Enlightenment.
@@ -40,7 +40,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING INSTALL README
-%{_datadir}/enlightenment/*
+%{_datadir}/e16/*
 
 %changelog