diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 981b8ea..d56a750 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
 
   helper :document
   
-  design :holder => 'virtual_community'
+  design :holder => 'environment'
 
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem
@@ -12,7 +12,7 @@ class ApplicationController < ActionController::Base
   init_gettext 'noosfero'
 
   before_filter :detect_stuff_by_domain
-  attr_reader :virtual_community
+  attr_reader :environment
 
   protected
 
@@ -20,9 +20,9 @@ class ApplicationController < ActionController::Base
   def detect_stuff_by_domain
     @domain = Domain.find_by_name(request.host)
     if @domain.nil?
-      @virtual_community = VirtualCommunity.default
+      @environment = Environment.default
     else
-      @virtual_community = @domain.virtual_community
+      @environment = @domain.environment
       @profile = @domain.profile
     end
   end
@@ -38,7 +38,7 @@ class ApplicationController < ActionController::Base
     @profile
   end
 
-  def self.acts_as_virtual_community_admin_controller
+  def self.acts_as_environment_admin_controller
     before_filter :load_admin_controller
   end
   def load_admin_controller
diff --git a/app/controllers/environment_admin/edit_template_controller.rb b/app/controllers/environment_admin/edit_template_controller.rb
index 2bc233b..33a5c29 100644
--- a/app/controllers/environment_admin/edit_template_controller.rb
+++ b/app/controllers/environment_admin/edit_template_controller.rb
@@ -1,6 +1,6 @@
 class EditTemplateController < EnvironmentAdminController
 
-  design_editor :holder => 'virtual_community', :autosave => true, :block_types => :block_types
+  design_editor :holder => 'environment', :autosave => true, :block_types => :block_types
   
   def block_types
     { 
diff --git a/app/controllers/environment_admin/features_controller.rb b/app/controllers/environment_admin/features_controller.rb
index 26c8e59..1ca2db6 100644
--- a/app/controllers/environment_admin/features_controller.rb
+++ b/app/controllers/environment_admin/features_controller.rb
@@ -1,9 +1,9 @@
 class FeaturesController < EnvironmentAdminController
 
-  acts_as_virtual_community_admin_controller
+  acts_as_environment_admin_controller
 
   def index
-    @features = VirtualCommunity.available_features
+    @features = Environment.available_features
   end
 
   post_only :update
@@ -13,8 +13,8 @@ class FeaturesController < EnvironmentAdminController
                else
                  params[:features].keys
                end
-    @virtual_community.enabled_features = features
-    @virtual_community.save!
+    @environment.enabled_features = features
+    @environment.save!
     flash[:notice] = _('Features updated successfully.')
     redirect_to :action => 'index'
   end
diff --git a/app/controllers/profile_admin/enterprise_controller.rb b/app/controllers/profile_admin/enterprise_controller.rb
index 0ddfebe..82aa0d4 100644
--- a/app/controllers/profile_admin/enterprise_controller.rb
+++ b/app/controllers/profile_admin/enterprise_controller.rb
@@ -11,7 +11,7 @@ class EnterpriseController < ProfileAdminController
     else
       redirect_to :action => 'list'
     end
-    @vitual_communities = VirtualCommunity.find(:all)
+    @vitual_communities = Environment.find(:all)
     @validation_entities = Organization.find(:all)
   end
   
@@ -28,7 +28,7 @@ class EnterpriseController < ProfileAdminController
   # Make a form to the creation of an eterprise
   def register_form
     @enterprise = Enterprise.new()
-    @vitual_communities = VirtualCommunity.find(:all)
+    @vitual_communities = Environment.find(:all)
     @validation_entities = Organization.find(:all)
   end
 
@@ -42,7 +42,7 @@ class EnterpriseController < ProfileAdminController
       redirect_to :action => 'index'
     else
       flash[:notice] = _('Enterprise was not created')
-      @vitual_communities = VirtualCommunity.find(:all)
+      @vitual_communities = Environment.find(:all)
       @validation_entities = Organization.find(:all)
       render :action => 'register_form'
     end
diff --git a/app/controllers/public/account_controller.rb b/app/controllers/public/account_controller.rb
index f855771..c2712e0 100644
--- a/app/controllers/public/account_controller.rb
+++ b/app/controllers/public/account_controller.rb
@@ -27,12 +27,12 @@ class AccountController < PublicController
   def signup
     begin
       @user = User.new(params[:user])
-      @user.terms_of_use = virtual_community.terms_of_use
-      @terms_of_use = virtual_community.terms_of_use
+      @user.terms_of_use = environment.terms_of_use
+      @terms_of_use = environment.terms_of_use
 
       if request.post?
         @user.save!
-        @user.person.virtual_community = virtual_community
+        @user.person.environment = environment
         @user.person.save!
         self.current_user = @user
         redirect_back_or_default(:controller => 'account', :action => 'index')
diff --git a/app/controllers/public/home_controller.rb b/app/controllers/public/home_controller.rb
index ad7ca17..5f3a84b 100644
--- a/app/controllers/public/home_controller.rb
+++ b/app/controllers/public/home_controller.rb
@@ -1,5 +1,5 @@
 class HomeController < PublicController
 
-  design :holder => 'virtual_community'
+  design :holder => 'environment'
 
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index adcfceb..2398c87 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -73,8 +73,8 @@ module ApplicationHelper
   # TODO: test this helper
   # TODO: add an icon?
   # TODO: the command rake test:rcov didn't works because of this method. See what it's the problem
-  def virtual_community_identification
-    content_tag('div', @virtual_community.name, :id => 'virtual_community_identification')
+  def environment_identification
+    content_tag('div', @environment.name, :id => 'environment_identification')
   end
 
   def link_to_cms(text, profile = nil, options = {})
diff --git a/app/models/domain.rb b/app/models/domain.rb
index a39393b..8c257f2 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -40,15 +40,15 @@ class Domain < ActiveRecord::Base
     name.downcase.sub(/^www\./, '')
   end
 
-  # detects the VirtualCommunity to which this domain belongs, either if it's
+  # detects the Environment to which this domain belongs, either if it's
   # directly owned by one, or through a profile who owns the domain but belongs
-  # to a VirtualCommunity.
-  def virtual_community
+  # to a Environment.
+  def environment
     case owner
-    when VirtualCommunity
+    when Environment
       owner
     when Profile
-      owner.virtual_community
+      owner.environment
     end
   end
 
@@ -56,7 +56,7 @@ class Domain < ActiveRecord::Base
   # not directly associated with a profile.
   def profile
     case owner
-    when VirtualCommunity
+    when Environment
       nil
     when Profile
       owner
diff --git a/app/models/profile.rb b/app/models/profile.rb
index cdaecf9..93dfe95 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -1,6 +1,6 @@
 # A Profile is the representation and web-presence of an individual or an
-# organization. Every Profile is attached to its VirtualCommunity of origin,
-# which by default is the one returned by VirtualCommunity:default.
+# organization. Every Profile is attached to its Environment of origin,
+# which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
 
   after_create do |profile|
@@ -32,7 +32,7 @@ class Profile < ActiveRecord::Base
   acts_as_taggable
 
   has_many :domains, :as => :owner
-  belongs_to :virtual_community
+  belongs_to :environment
   
   has_many :role_assignments, :as => :resource
   has_many :people, :through => :role_assignments
@@ -56,11 +56,11 @@ class Profile < ActiveRecord::Base
   validates_uniqueness_of :user_id, :allow_nil =>true
 
   # creates a new Profile. By default, it is attached to the default
-  # VirtualCommunity (see VirtualCommunity#default), unless you tell it
+  # Environment (see Environment#default), unless you tell it
   # otherwise
   def initialize(*args)
     super(*args)
-    self.virtual_community ||= VirtualCommunity.default
+    self.environment ||= Environment.default
   end
 
   # Searches tags by tag or name
diff --git a/app/models/virtual_community.rb b/app/models/virtual_community.rb
index 82dfb11..73fe8b3 100644
--- a/app/models/virtual_community.rb
+++ b/app/models/virtual_community.rb
@@ -1,9 +1,9 @@
-# A VirtualCommunity is like a website to be hosted in the platform. It may
+# A Environment is like a website to be hosted in the platform. It may
 # contain multiple Profile's and can be identified by several different
 # domains.
-class VirtualCommunity < ActiveRecord::Base
+class Environment < ActiveRecord::Base
 
-  # returns the available features for a VirtualCommunity, in the form of a
+  # returns the available features for a Environment, in the form of a
   # hash, with pairs in the form <tt>'feature_name' => 'Feature name'</tt>.
   def self.available_features
     {
@@ -18,7 +18,7 @@ class VirtualCommunity < ActiveRecord::Base
 
   acts_as_design
 
-  # One VirtualCommunity can be reached by many domains
+  # One Environment can be reached by many domains
   has_many :domains, :as => :owner
   has_many :profiles
 
@@ -26,10 +26,10 @@ class VirtualCommunity < ActiveRecord::Base
   # Attributes
   # #################################################
 
-  # store the VirtualCommunity settings as YAML-serialized Hash.
+  # store the Environment settings as YAML-serialized Hash.
   serialize :settings
 
-  # returns a Hash containing the VirtualCommunity configuration
+  # returns a Hash containing the Environment configuration
   def settings
     self[:settings] ||= {}
   end
@@ -74,7 +74,7 @@ class VirtualCommunity < ActiveRecord::Base
     self.settings['terms_of_use'] = value
   end
 
-  # returns <tt>true</tt> if this VirtualCommunity has terms of use to be
+  # returns <tt>true</tt> if this Environment has terms of use to be
   # accepted by users before registration.
   def has_terms_of_use?
     ! self.settings['terms_of_use'].nil?
@@ -118,13 +118,13 @@ class VirtualCommunity < ActiveRecord::Base
   validates_presence_of :name
 
   # only one virtual community can be the default one
-  validates_uniqueness_of :is_default, :if => (lambda do |virtual_community| virtual_community.is_default? end), :message => _('Only one Virtual Community can be the default one')
+  validates_uniqueness_of :is_default, :if => (lambda do |environment| environment.is_default? end), :message => _('Only one Virtual Community can be the default one')
 
   # #################################################
   # Business logic in general
   # #################################################
 
-  # the default VirtualCommunity.
+  # the default Environment.
   def self.default
     self.find(:first, :conditions => [ 'is_default = ?', true ] )
   end
diff --git a/app/views/features/_features_table.rhtml b/app/views/features/_features_table.rhtml
index c6b0b0f..3e1175e 100644
--- a/app/views/features/_features_table.rhtml
+++ b/app/views/features/_features_table.rhtml
@@ -3,7 +3,7 @@
   <% @features.each do |feature, text| %>
   <tr>
     <td><%= text %></td>
-    <td><%= check_box_tag "features[#{feature}]", '1', @virtual_community.enabled?(feature) %></td>
+    <td><%= check_box_tag "features[#{feature}]", '1', @environment.enabled?(feature) %></td>
   </tr>
   <% end %>
   <tr><td colspan='2'><%= submit_tag _('Save changes') %></td></tr>
diff --git a/app/views/home/index.rhtml b/app/views/home/index.rhtml
index 520c6fb..a4a4948 100644
--- a/app/views/home/index.rhtml
+++ b/app/views/home/index.rhtml
@@ -1,3 +1,3 @@
 <%= flash[:notice] %>
-Start page of Virtual Community <%= @virtual_community.name %>
+Start page of Virtual Community <%= @environment.name %>
 
diff --git a/config/environment.rb b/config/environment.rb
index 2cca8b6..14a6a69 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -82,17 +82,17 @@ Comatose.configure do |config|
   config.admin_helpers << :application_helper
   config.admin_helpers << :document_helper
 end
-Comatose::AdminController.design :holder => 'virtual_community'
+Comatose::AdminController.design :holder => 'environment'
 Comatose::AdminController.before_filter do |controller|
   # TODO: copy/paste; extract this into a method (see
   # app/controllers/application.rb)
   domain = Domain.find_by_name(controller.request.host)
   if domain.nil?
-    virtual_community = VirtualCommunity.default
+    environment = Environment.default
   else
-    virtual_community = domain.virtual_community
+    environment = domain.environment
     profile = domain.profile
   end
-  controller.instance_variable_set('@virtual_community', virtual_community)
+  controller.instance_variable_set('@environment', environment)
 end
 
diff --git a/db/migrate/002_create_virtual_communities.rb b/db/migrate/002_create_virtual_communities.rb
index 5892118..98b2e16 100644
--- a/db/migrate/002_create_virtual_communities.rb
+++ b/db/migrate/002_create_virtual_communities.rb
@@ -1,12 +1,12 @@
-class CreateVirtualCommunities < ActiveRecord::Migration
+class CreateEnvironments < ActiveRecord::Migration
   def self.up
-    create_table :virtual_communities do |t|
+    create_table :environments do |t|
       t.column :name,       :string
       t.column :is_default, :boolean
       t.column :settings,   :text
       t.column :design_data, :text
     end
-    VirtualCommunity.create!(:name => 'Default Virtual Community', :is_default => true)
+    Environment.create!(:name => 'Default Environment', :is_default => true)
   end
 
   def self.down
diff --git a/db/migrate/003_create_profiles.rb b/db/migrate/003_create_profiles.rb
index 061c7b6..c7080b1 100644
--- a/db/migrate/003_create_profiles.rb
+++ b/db/migrate/003_create_profiles.rb
@@ -4,7 +4,7 @@ class CreateProfiles < ActiveRecord::Migration
       t.column :name,                                   :string
       t.column :type,                                   :string
       t.column :identifier,                             :string
-      t.column :virtual_community_id,                   :integer
+      t.column :environment_id,                   :integer
       t.column :flexible_template_template,             :string, :default => "default"
       t.column :flexible_template_theme,                :string, :default => "default"
       t.column :flexible_template_icon_theme,           :string, :default => "default"
diff --git a/po/noosfero.pot b/po/noosfero.pot
index e518c85..179c8e6 100644
--- a/po/noosfero.pot
+++ b/po/noosfero.pot
@@ -226,35 +226,35 @@ msgstr ""
 msgid "PersonInfo|Contact information"
 msgstr ""
 
-#: app/models/virtual_community.rb:-
+#: app/models/environment.rb:-
 msgid "virtual community"
 msgstr ""
 
-#: app/models/virtual_community.rb:-
-msgid "VirtualCommunity|Name"
+#: app/models/environment.rb:-
+msgid "Environment|Name"
 msgstr ""
 
-#: app/models/virtual_community.rb:-
-msgid "VirtualCommunity|Is default"
+#: app/models/environment.rb:-
+msgid "Environment|Is default"
 msgstr ""
 
-#: app/models/virtual_community.rb:-
-msgid "VirtualCommunity|Settings"
+#: app/models/environment.rb:-
+msgid "Environment|Settings"
 msgstr ""
 
-#: app/models/virtual_community.rb:-
-msgid "VirtualCommunity|Design data"
+#: app/models/environment.rb:-
+msgid "Environment|Design data"
 msgstr ""
 
-#: app/models/virtual_community.rb:10
+#: app/models/environment.rb:10
 msgid "Some feature"
 msgstr ""
 
-#: app/models/virtual_community.rb:11
+#: app/models/environment.rb:11
 msgid "Other feature"
 msgstr ""
 
-#: app/models/virtual_community.rb:121
+#: app/models/environment.rb:121
 msgid "Only one Virtual Community can be the default one"
 msgstr ""
 
diff --git a/po/pt_BR/noosfero.po b/po/pt_BR/noosfero.po
index 9968f2b..91973f8 100644
--- a/po/pt_BR/noosfero.po
+++ b/po/pt_BR/noosfero.po
@@ -228,35 +228,35 @@ msgstr "Endereço"
 msgid "PersonInfo|Contact information"
 msgstr "Informação de contato"
 
-#: app/models/virtual_community.rb:-
+#: app/models/environment.rb:-
 msgid "virtual community"
 msgstr "comunidade virtual"
 
-#: app/models/virtual_community.rb:-
-msgid "VirtualCommunity|Name"
+#: app/models/environment.rb:-
+msgid "Environment|Name"
 msgstr "Nome"
 
-#: app/models/virtual_community.rb:-
-msgid "VirtualCommunity|Is default"
+#: app/models/environment.rb:-
+msgid "Environment|Is default"
 msgstr "É padrão"
 
-#: app/models/virtual_community.rb:-
-msgid "VirtualCommunity|Settings"
+#: app/models/environment.rb:-
+msgid "Environment|Settings"
 msgstr "Configurações"
 
-#: app/models/virtual_community.rb:-
-msgid "VirtualCommunity|Design data"
+#: app/models/environment.rb:-
+msgid "Environment|Design data"
 msgstr "Dados de design"
 
-#: app/models/virtual_community.rb:10
+#: app/models/environment.rb:10
 msgid "Some feature"
 msgstr "Alguma funcionalidade"
 
-#: app/models/virtual_community.rb:11
+#: app/models/environment.rb:11
 msgid "Other feature"
 msgstr "Outra funcionalidade"
 
-#: app/models/virtual_community.rb:121
+#: app/models/environment.rb:121
 msgid "Only one Virtual Community can be the default one"
 msgstr "Apenas uma comunidade virtual pode ser a padrão"
 
diff --git a/public/artwork/newbar/menu.html b/public/artwork/newbar/menu.html
index 8953a9c..c9fb581 100644
--- a/public/artwork/newbar/menu.html
+++ b/public/artwork/newbar/menu.html
@@ -90,7 +90,7 @@
       </div><!-- id="noosfero_bar" -->
 
       <div id="header">
-	<div id="virtual_community_identification">Default Virtual Community</div>
+	<div id="environment_identification">Default Virtual Community</div>
       </div>
 
       <div id='content'>
diff --git a/public/artwork/tmp/bar.html b/public/artwork/tmp/bar.html
index 737228a..3047274 100644
--- a/public/artwork/tmp/bar.html
+++ b/public/artwork/tmp/bar.html
@@ -50,7 +50,7 @@
         </div>
 
         <div id="header">
-          <div id="virtual_community_identification">Default Virtual Community</div>
+          <div id="environment_identification">Default Virtual Community</div>
 <div id="user_links">
 <span id="login_name">Login Name</span><br />
 <a href="#" id="perfil_edit_button">Editar Perfil</a>|<a href="#" id="logout_button">Sair</a>
diff --git a/public/artwork/tmp/stylesheets/blue_bar.css b/public/artwork/tmp/stylesheets/blue_bar.css
index d6e8723..cafd4b5 100644
--- a/public/artwork/tmp/stylesheets/blue_bar.css
+++ b/public/artwork/tmp/stylesheets/blue_bar.css
@@ -33,7 +33,7 @@
   color: #ffffff;
 }
 
-#virtual_community_identification {
+#environment_identification {
 float: left;
 background: url("../images/bg_blue_logo.png") left bottom no-repeat;
 vertical-align: bottom;
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index b4c87b5..28cf8ec 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -22,7 +22,7 @@ a:hover img {
 
 /* Bar Blue Default */
 
-#virtual_community_identification {
+#environment_identification {
 position: absolute !important;
 background: url("../images/bg_blue_logo.png") 5px no-repeat !important;
 vertical-align: bottom !important ;
@@ -32,7 +32,7 @@ line-height: 34px !important ;
 padding-left: 60px !important ;
 }
 
-#virtual_community_identification:hover {
+#environment_identification:hover {
 color: #dfdfdf !important ;
 }
 
diff --git a/test/fixtures/domains.yml b/test/fixtures/domains.yml
index c8c7473..043853e 100644
--- a/test/fixtures/domains.yml
+++ b/test/fixtures/domains.yml
@@ -2,12 +2,12 @@
 one:
   id: 1
   name: colivre.net
-  owner_type: VirtualCommunity
+  owner_type: Environment
   owner_id: 1
 two:
   id: 2
   name: anhetegua.net
-  owner_type: VirtualCommunity
+  owner_type: Environment
   owner_id: 2
 three:
   id: 3
diff --git a/test/fixtures/profiles.yml b/test/fixtures/profiles.yml
index 53c3d66..46dd656 100644
--- a/test/fixtures/profiles.yml
+++ b/test/fixtures/profiles.yml
@@ -4,7 +4,7 @@ johndoe:
   name: 'John Doe'
   type: 'Person' 
   identifier: johndoe
-  virtual_community_id: 1
+  environment_id: 1
   user_id: 1
   flexible_template_template: 'default'
   flexible_template_icon_theme: 'default'
@@ -14,7 +14,7 @@ joerandomhacker:
   name: 'Joe Random Hacker'
   type: 'Person'
   identifier: joerandomhacker
-  virtual_community_id: 1
+  environment_id: 1
   user_id: 2
   flexible_template_template: 'simple'
   flexible_template_icon_theme: 'simple'
@@ -24,7 +24,7 @@ john_and_joe:
   name: "John and Joe's Production Cooperative"
   type: 'Person'
   identifier: john_and_joe
-  virtual_community_id: 1
+  environment_id: 1
   flexible_template_template: 'simple'
   flexible_template_icon_theme: 'simple'
   flexible_template_theme: 'simple'
@@ -34,7 +34,7 @@ ze:
   type: 'Person'
   user_id: 3
   identifier: ze
-  virtual_community_id: 1
+  environment_id: 1
   flexible_template_template: 'default'
   flexible_template_icon_theme: 'default'
   flexible_template_theme: 'default'
@@ -43,7 +43,7 @@ colivre:
   name: "cooptec_livre"
   type: 'Enterprise'
   identifier: 'colivre'
-  virtual_community_id: 1
+  environment_id: 1
   flexible_template_template: 'default'
   flexible_template_icon_theme: 'default'
   flexible_template_theme: 'default'
@@ -52,7 +52,7 @@ empreendimentoB:
   name: "emp B"
   type: 'Enterprise'
   identifier: "empb"
-  virtual_community_id: 1
+  environment_id: 1
   flexible_template_template: 'default'
   flexible_template_icon_theme: 'default'
   flexible_template_theme: 'default'
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 897f698..a451a34 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -70,7 +70,7 @@ class AccountControllerTest < Test::Unit::TestCase
 
   def test_shoud_not_save_without_acceptance_of_terms_of_use_on_signup
     assert_no_difference User, :count do
-      VirtualCommunity.default.update_attributes(:terms_of_use => 'some terms ...')
+      Environment.default.update_attributes(:terms_of_use => 'some terms ...')
       create_user
       assert_response :success
     end
@@ -78,7 +78,7 @@ class AccountControllerTest < Test::Unit::TestCase
 
   def test_shoud_save_with_acceptance_of_terms_of_use_on_signup
     assert_difference User, :count do
-      VirtualCommunity.default.update_attributes(:terms_of_use => 'some terms ...')      
+      Environment.default.update_attributes(:terms_of_use => 'some terms ...')      
       create_user(:terms_accepted => '1')
       assert_response :redirect
     end
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index 680b45b..291b208 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -14,9 +14,9 @@ class ApplicationControllerTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
   end
 
-  def test_exist_virtual_community_variable_to_helper_virtual_community_identification
+  def test_exist_environment_variable_to_helper_environment_identification
     get :index
-    assert_not_nil assigns(:virtual_community)
+    assert_not_nil assigns(:environment)
   end
 
   def test_get_against_post_only
diff --git a/test/functional/features_controller_test.rb b/test/functional/features_controller_test.rb
index 7c14984..171f883 100644
--- a/test/functional/features_controller_test.rb
+++ b/test/functional/features_controller_test.rb
@@ -18,7 +18,7 @@ class FeaturesControllerTest < Test::Unit::TestCase
     uses_host 'anhetegua.net'
     get :index
     assert_template 'index'
-    VirtualCommunity.available_features.each do |feature, text|
+    Environment.available_features.each do |feature, text|
       assert_tag(:tag => 'input', :attributes => { :type => 'checkbox', :name => "features[#{feature}]" })
     end
   end
@@ -28,7 +28,7 @@ class FeaturesControllerTest < Test::Unit::TestCase
     post :update, :features => { 'feature1' => '1', 'feature2' => '1' }
     assert_redirected_to :action => 'index'
     assert_kind_of String, flash[:notice]
-    v = VirtualCommunity.find(virtual_communities(:anhetegua_net).id)
+    v = Environment.find(virtual_communities(:anhetegua_net).id)
     assert v.enabled?('feature2')
     assert v.enabled?('feature2') 
     assert !v.enabled?('feature3')
@@ -39,7 +39,7 @@ class FeaturesControllerTest < Test::Unit::TestCase
     post :update # no features
     assert_redirected_to :action => 'index'
     assert_kind_of String, flash[:notice]
-    v = VirtualCommunity.find(virtual_communities(:anhetegua_net).id)
+    v = Environment.find(virtual_communities(:anhetegua_net).id)
     assert !v.enabled?('feature1')
     assert !v.enabled?('feature2')
     assert !v.enabled?('feature3')
diff --git a/test/functional/home_controller_test.rb b/test/functional/home_controller_test.rb
index 4db8b6a..cec3127 100644
--- a/test/functional/home_controller_test.rb
+++ b/test/functional/home_controller_test.rb
@@ -14,12 +14,12 @@ class HomeControllerTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
   end
 
-  def test_detection_of_virtual_community_by_host
+  def test_detection_of_environment_by_host
     uses_host 'www.colivre.net'
     get :index
     assert_template 'index'
 
-    assert_kind_of VirtualCommunity, assigns(:virtual_community)
+    assert_kind_of Environment, assigns(:environment)
 
     assert_kind_of Domain, assigns(:domain)
     assert_equal 'colivre.net', assigns(:domain).name
@@ -32,7 +32,7 @@ class HomeControllerTest < Test::Unit::TestCase
     get :index
     assert_template 'index'
 
-    assert_kind_of VirtualCommunity, assigns(:virtual_community)
+    assert_kind_of Environment, assigns(:environment)
 
     assert_kind_of Domain, assigns(:domain)
     assert_equal 'jrh.net', assigns(:domain).name
@@ -40,14 +40,14 @@ class HomeControllerTest < Test::Unit::TestCase
     assert_kind_of Profile, assigns(:profile)
   end
 
-  def test_unknown_domain_falls_back_to_default_virtual_community
+  def test_unknown_domain_falls_back_to_default_environment
     uses_host 'veryunprobabledomain.com'
 
     get :index
     assert_template 'index'
 
-    assert_kind_of VirtualCommunity, assigns(:virtual_community)
-    assert assigns(:virtual_community).is_default?
+    assert_kind_of Environment, assigns(:environment)
+    assert assigns(:environment).is_default?
 
   end
 
diff --git a/test/integration/signup_test.rb b/test/integration/signup_test.rb
index 1950ac7..ef6f451 100644
--- a/test/integration/signup_test.rb
+++ b/test/integration/signup_test.rb
@@ -4,7 +4,7 @@ class AccountTest < ActionController::IntegrationTest
   fixtures :users, :profiles, :domains, :virtual_communities
 
   def test_should_require_acceptance_of_terms_for_signup
-    VirtualCommunity.default.update_attributes(:terms_of_use => 'You agree that from now on your soul belongs to us.')
+    Environment.default.update_attributes(:terms_of_use => 'You agree that from now on your soul belongs to us.')
 
     count = User.count
 
diff --git a/test/mocks/test/virtual_community.rb b/test/mocks/test/virtual_community.rb
index f907c1e..131abfe 100644
--- a/test/mocks/test/virtual_community.rb
+++ b/test/mocks/test/virtual_community.rb
@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) +  "/../../../app/models/virtual_community")
+require File.expand_path(File.dirname(__FILE__) +  "/../../../app/models/environment")
 
-class VirtualCommunity < ActiveRecord::Base
+class Environment < ActiveRecord::Base
   def self.available_features
     {
     'feature1' => 'Enable Feature 1',
diff --git a/test/unit/domain_test.rb b/test/unit/domain_test.rb
index 0ba50f6..af1345f 100644
--- a/test/unit/domain_test.rb
+++ b/test/unit/domain_test.rb
@@ -24,9 +24,9 @@ class DomainTest < Test::Unit::TestCase
 
   def test_owner
     d = Domain.new(:name => 'example.com')
-    d.owner = VirtualCommunity.new(:name => 'Example')
+    d.owner = Environment.new(:name => 'Example')
     assert d.save
-    assert_kind_of VirtualCommunity, d.owner
+    assert_kind_of Environment, d.owner
   end
 
   def test_get_domain_name
@@ -64,22 +64,22 @@ class DomainTest < Test::Unit::TestCase
     assert d.errors.invalid?(:name)
   end
 
-  def test_virtual_community
-    # domain directly linked to VirtualCommunity
+  def test_environment
+    # domain directly linked to Environment
     domain = Domain.find_by_name('colivre.net')
-    assert_kind_of VirtualCommunity, domain.owner
-    assert_kind_of VirtualCommunity, domain.virtual_community
+    assert_kind_of Environment, domain.owner
+    assert_kind_of Environment, domain.environment
 
     # domain linked to Profile
     domain = Domain.find_by_name('johndoe.net')
     assert_kind_of Profile, domain.owner
-    assert_kind_of VirtualCommunity, domain.virtual_community
+    assert_kind_of Environment, domain.environment
   end
 
   def test_profile
     # domain linked to profile
     assert_not_nil Domain.find_by_name('johndoe.net').profile
-    # domain linked to VirtualCommunity
+    # domain linked to Environment
     assert_nil Domain.find_by_name('colivre.net').profile
   end
 
diff --git a/test/unit/enterprise_test.rb b/test/unit/enterprise_test.rb
index 2b84f41..3480582 100644
--- a/test/unit/enterprise_test.rb
+++ b/test/unit/enterprise_test.rb
@@ -34,9 +34,9 @@ class EnterpriseTest < Test::Unit::TestCase
     assert_kind_of Array, p.domains
   end
 
-  def test_belongs_to_virtual_community_and_has_default
+  def test_belongs_to_environment_and_has_default
     p = Enterprise.new
-    assert_kind_of VirtualCommunity, p.virtual_community
+    assert_kind_of Environment, p.environment
   end
 
   def test_cannot_rename
diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb
index 94032b8..b659d17 100644
--- a/test/unit/profile_test.rb
+++ b/test/unit/profile_test.rb
@@ -34,9 +34,9 @@ class ProfileTest < Test::Unit::TestCase
     assert_kind_of Array, p.domains
   end
 
-  def test_belongs_to_virtual_community_and_has_default
+  def test_belongs_to_environment_and_has_default
     p = Profile.new
-    assert_kind_of VirtualCommunity, p.virtual_community
+    assert_kind_of Environment, p.environment
   end
 
   def test_cannot_rename
diff --git a/test/unit/virtual_community_test.rb b/test/unit/virtual_community_test.rb
index 154d84d..e1f3cab 100644
--- a/test/unit/virtual_community_test.rb
+++ b/test/unit/virtual_community_test.rb
@@ -1,24 +1,24 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class VirtualCommunityTest < Test::Unit::TestCase
+class EnvironmentTest < Test::Unit::TestCase
   fixtures :virtual_communities
 
   def test_exists_default_and_it_is_unique
-    VirtualCommunity.delete_all
-    vc = VirtualCommunity.new(:name => 'Test Community')
+    Environment.delete_all
+    vc = Environment.new(:name => 'Test Community')
     vc.is_default = true
     assert vc.save
 
-    vc2 = VirtualCommunity.new(:name => 'Another Test Community')
+    vc2 = Environment.new(:name => 'Another Test Community')
     vc2.is_default = true
     assert !vc2.valid?
     assert vc2.errors.invalid?(:is_default)
 
-    assert_equal vc, VirtualCommunity.default
+    assert_equal vc, Environment.default
   end
 
   def test_acts_as_configurable
-    vc = VirtualCommunity.new(:name => 'Testing VirtualCommunity')
+    vc = Environment.new(:name => 'Testing Environment')
     assert_kind_of Hash, vc.settings
     vc.settings[:some_setting] = 1
     assert vc.save
@@ -26,11 +26,11 @@ class VirtualCommunityTest < Test::Unit::TestCase
   end
 
   def test_available_features
-    assert_kind_of Hash, VirtualCommunity.available_features
+    assert_kind_of Hash, Environment.available_features
   end
 
   def test_mock
-    assert_equal ['feature1', 'feature2', 'feature3'], VirtualCommunity.available_features.keys.sort
+    assert_equal ['feature1', 'feature2', 'feature3'], Environment.available_features.keys.sort
   end
 
   def test_features
@@ -54,7 +54,7 @@ class VirtualCommunityTest < Test::Unit::TestCase
   end
 
   def test_name_is_mandatory
-    v = VirtualCommunity.new
+    v = Environment.new
     v.valid?
     assert v.errors.invalid?(:name)
     v.name = 'blablabla'
@@ -63,23 +63,23 @@ class VirtualCommunityTest < Test::Unit::TestCase
   end
 
   def test_terms_of_use
-    v = VirtualCommunity.new(:name => 'My test virtual community')
+    v = Environment.new(:name => 'My test virtual community')
     assert_nil v.terms_of_use
     v.terms_of_use = 'To be part of this virtual community, you must accept the following terms: ...'
     assert v.save
     id = v.id
-    assert_equal 'To be part of this virtual community, you must accept the following terms: ...', VirtualCommunity.find(id).terms_of_use
+    assert_equal 'To be part of this virtual community, you must accept the following terms: ...', Environment.find(id).terms_of_use
   end
 
   def test_has_terms_of_use
-    v = VirtualCommunity.new
+    v = Environment.new
     assert !v.has_terms_of_use?
     v.terms_of_use = 'some terms of use'
     assert v.has_terms_of_use?
   end
 
   def test_should_profive_flexible_template_stuff
-    v = VirtualCommunity.new
+    v = Environment.new
 
     # template
     assert_nil v.flexible_template_template
--
libgit2 0.21.2