diff --git a/src/cloud/ec2/lib/econe-server.rb b/src/cloud/ec2/lib/econe-server.rb
index 0d20b59cc4..01c18da86c 100644
--- a/src/cloud/ec2/lib/econe-server.rb
+++ b/src/cloud/ec2/lib/econe-server.rb
@@ -33,9 +33,9 @@ end
 
 EC2_AUTH           = VAR_LOCATION + "/.one/ec2_auth"
 EC2_LOG            = LOG_LOCATION + "/econe-server.log"
-CONFIGURATION_FILE = ETC_LOCATION + "/occi-server.conf"
+CONFIGURATION_FILE = ETC_LOCATION + "/econe.conf"
 
-TEMPLATE_LOCATION  = ETC_LOCATION + "/occi_templates"
+TEMPLATE_LOCATION  = ETC_LOCATION + "/econe_templates"
 VIEWS_LOCATION     = RUBY_LIB_LOCATION + "/cloud/econe/views"
 
 $: << RUBY_LIB_LOCATION