diff --git a/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake b/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake
index 1cd00cf..b4d04c3 100644
--- a/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake
+++ b/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake
@@ -1,5 +1,30 @@
 NUMBER_OF_SOFTWARES = 10
 
+def create_community(name)
+  community = Community.new
+  community.name = name
+  community.save
+  community
+end
+
+def create_software_info(name, acronym = "", finality = "default")
+  community = create_community(name)
+  software_info = SoftwareInfo.new
+  software_info.community = community
+  software_info.public_software = true
+  software_info.acronym = acronym
+  software_info.finality = finality
+  software_info.license_info = LicenseInfo.first
+
+  if software_info.community.valid? && software_info.valid?
+    print "."
+    software_info.save
+    software_info
+  else
+    print "F"
+    nil
+  end
+end
 namespace :software do
   desc "Create sample softwares"
   task :create_sample_softwares => :environment do
@@ -44,28 +69,3 @@ namespace :software do
   end
 end
 
-def create_community(name)
-  community = Community.new
-  community.name = name
-  community.save
-  community
-end
-
-def create_software_info(name, acronym = "", finality = "default")
-  community = create_community(name)
-  software_info = SoftwareInfo.new
-  software_info.community = community
-  software_info.public_software = true
-  software_info.acronym = acronym
-  software_info.finality = finality
-  software_info.license_info = LicenseInfo.first
-
-  if software_info.community.valid? && software_info.valid?
-    print "."
-    software_info.save
-    software_info
-  else
-    print "F"
-    nil
-  end
-end
diff --git a/src/noosfero-spb/software_communities/lib/tasks/import_sisp_software.rake b/src/noosfero-spb/software_communities/lib/tasks/import_sisp_software.rake
index b26f380..e95d63c 100755
--- a/src/noosfero-spb/software_communities/lib/tasks/import_sisp_software.rake
+++ b/src/noosfero-spb/software_communities/lib/tasks/import_sisp_software.rake
@@ -3,14 +3,18 @@
 namespace :software do
   desc "Creates SISP software template"
   task :create_sisp_template => :environment do
-    env = Environment.find_by_name("sisp")
+    # env = Environment.find_by_name("sisp")
+    env = Environment.default #TODO change this to correct environment
 
     if env.present?
-      template = Community.where(identifier: "software", environment_id: env).last
-      template ||= Community.create!(name: "Software", identifier: "software", is_template: true, environment: env)
+      template = Community.where(identifier: "sisp-software", environment_id: env).last
 
-      template.boxes.find_by_position(1).blocks << StatisticBlock.new
-      template.save!
+      unless template
+        template ||= Community.create!(name: "Sisp Software", identifier: "sisp-software", is_template: true, environment: env)
+
+        template.boxes.find_by_position(1).blocks << StatisticBlock.new
+        template.save!
+      end
     end
   end
 
@@ -58,7 +62,7 @@ namespace :software do
   end
 end
 
-def create_community name
+def create_sisp_community name
 
   identifier = create_identifier name
 
@@ -79,8 +83,8 @@ def create_community name
   community
 end
 
-def create_software_info name, finality = "blank", acronym = ""
-  community = create_community(name)
+def create_sisp_software_info name, finality = "blank", acronym = ""
+  community = create_sisp_community(name)
 
   if community.software?
     return community.software_info
@@ -204,7 +208,7 @@ def create_software_and_attrs sisp_hash
 
   identifier = create_identifier name
 
-  software = create_software_info(name)
+  software = create_sisp_software_info(name)
 
   create_ratings identifier, sisp_hash
 
--
libgit2 0.21.2