diff --git a/tasks/index.task b/tasks/index.task
index fba9e61..25d003c 100644
--- a/tasks/index.task
+++ b/tasks/index.task
@@ -31,7 +31,7 @@ begin
     task :solr_schema_xml do
       @index_config = @ms.config[:index]
       
-      template_file = File.open( "#{File.dirname(__FILE__)}/../templates/solr_schema.xml.erubis", "r" )
+      template_file = File.open( "#{File.dirname(__FILE__)}/../templates/solr_schema.xml.erb", "r" )
       template      = Erubis::Eruby.new( template_file.read )
       template_file.close()
     
diff --git a/tasks/wtsi_search.task b/tasks/wtsi_search.task
index 80fae53..09950b2 100644
--- a/tasks/wtsi_search.task
+++ b/tasks/wtsi_search.task
@@ -121,7 +121,7 @@ begin
         # Dump data to XML following WTSI search index requirements
         puts " - Writing data to disk"
         
-        template_file = File.new( "#{File.dirname(__FILE__)}/../templates/wtsi_search_engine.xml.erubis", 'r' )
+        template_file = File.new( "#{File.dirname(__FILE__)}/../templates/wtsi_search_engine.xml.erb", 'r' )
         template = Erubis::Eruby.new( template_file.read )
         template_file.close()
       
diff --git a/templates/solr_schema.xml.erubis b/templates/solr_schema.xml.erb
similarity index 100%
rename from templates/solr_schema.xml.erubis
rename to templates/solr_schema.xml.erb
diff --git a/templates/wtsi_search_engine.xml.erubis b/templates/wtsi_search_engine.xml.erb
similarity index 100%
rename from templates/wtsi_search_engine.xml.erubis
rename to templates/wtsi_search_engine.xml.erb