diff --git a/bin/account-manager-client.pl.in b/bin/account-manager-client.pl.in
index 5076fb7d08994237bc2fb2de2d1968a843b1e3ca..793ebc4265586ca0ab843c625c7b0129a589d52b 100755
--- a/bin/account-manager-client.pl.in
+++ b/bin/account-manager-client.pl.in
@@ -46,7 +46,7 @@ pod2usage(
 ) unless $action;
 
 my $configuration = IdPAccountManager::Configuration->new(
-    file => '@sysconfdir@/IdPAccountManager.conf'
+    file => '@sysconfdir@/manager.conf'
 );
 
 IdPAccountManager::DB->register_db(
diff --git a/bin/account-manager-web.pl.in b/bin/account-manager-web.pl.in
index bd996d7c64e6d4eebaff166ba424e5496b9066a0..865f20fd3004cc4bcc696c6e112c574950e5f61c 100755
--- a/bin/account-manager-web.pl.in
+++ b/bin/account-manager-web.pl.in
@@ -9,7 +9,7 @@ use IdPAccountManager::Configuration;
 use IdPAccountManager::WebRequest;
 
 my $configuration = IdPAccountManager::Configuration->new(
-    file => '@sysconfdir@/IdPAccountManager.conf'
+    file => '@sysconfdir@/manager.conf'
 );
 
 my $request = new IdPAccountManager::WebRequest(
diff --git a/conf/Makefile.am b/conf/Makefile.am
index 97dbed6d683629992c68cef3bebeca706b7439f3..17045c5184a8a14d4bc7d12f5c8b20069354a5a4 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -1,8 +1,18 @@
-noinst_DATA = IdPAccountManager.conf
+noinst_DATA = manager.conf
+
+extra_DIST = manager.conf.in
+
+manager.conf: Makefile manager.conf.in
+	sed \
+		-e 's|[@]templatesdir[@]|$(templatesdir)|' \
+		-e 's|[@]sysconfdir[@]|$(sysconfdir)|' \
+		< $(srcdir)/$@.in > $@
+	chmod +x $@
+
 
 install-data-local:
-	if [ -f $(DESTDIR)$(sysconfdir)/IdPAccountManager.conf ]; then                                           \
-	    $(INSTALL_DATA) $(srcdir)/IdPAccountManager.conf $(DESTDIR)$(sysconfdir)/IdPAccountManager.conf.new; \
+	if [ -f $(DESTDIR)$(sysconfdir)/manager.conf ]; then                                           \
+	    $(INSTALL_DATA) $(srcdir)/manager.conf $(DESTDIR)$(sysconfdir)/manager.conf.new; \
 	else                                                                                                     \
-	    $(INSTALL_DATA) $(srcdir)/IdPAccountManager.conf $(DESTDIR)$(sysconfdir)/IdPAccountManager.conf;     \
+	    $(INSTALL_DATA) $(srcdir)/manager.conf $(DESTDIR)$(sysconfdir)/manager.conf;     \
 	fi
diff --git a/conf/IdPAccountManager.conf b/conf/manager.conf.in
similarity index 94%
rename from conf/IdPAccountManager.conf
rename to conf/manager.conf.in
index ba6538fb5d09fea5a1cbc2483c30e0ff5c7c610f..242db6627206e1a229b6e985c68d44e4c5bbcb1a 100644
--- a/conf/IdPAccountManager.conf
+++ b/conf/manager.conf.in
@@ -26,7 +26,7 @@ idp_displayname = eduGAIN Access Check
 root_ssp_dir = /opt/testidp/simplesamlphp
 
 # Templates directory
-templates_dir = templates
+templates_dir = @templatesdir@
 
 # Database type refers to a Perl Database Driver name
 # However only a subset of existing DBDs are supported by Rose::DB::Object:
@@ -71,7 +71,7 @@ dev_sp_contact = john@my.fqdn, sarah@my.fqdn
 notice_from = edugain-access-check.fqdn
 
 # federation metadata local copy path
-federation_metadata_file_path = /opt/testidp/IdPAccountManager/conf/edugain-md.xml
+federation_metadata_file_path = @sysconfdir@/edugain-md.xml
 
 # Valid account profiles
 account_profiles = fullset1, limitedset1, generic1, student1, student2, teacher1, teacher2, alumni1, librarywalkin1, employee1, researcher1
diff --git a/configure.ac b/configure.ac
index d0fb9d9e4322eaa5a310c5a8a9822641855f5781..1b3f350ddd30d7ff9e396e0ee7aa6eb7e200057f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 AC_PREREQ(2.59)
-AC_INIT([IdP Account Manager], 0.1)
+AC_INIT([Account Manager], 0.1)
 AM_INIT_AUTOMAKE([foreign])
 
-wwwdir=$datadir/idp-account-manager/www
-modulesdir=$datadir/idp-account-manager/lib
-templatesdir=$datadir/idp-account-manager/templates
+wwwdir=$datadir/account-manager/www
+modulesdir=$datadir/account-manager/lib
+templatesdir=$datadir/account-manager/templates
 
 AC_SUBST(wwwdir)
 AC_SUBST(modulesdir)