diff --git a/app/controllers/cas/application_controller.rb b/app/controllers/cas/application_controller.rb
index 2424355..0110402 100644
--- a/app/controllers/cas/application_controller.rb
+++ b/app/controllers/cas/application_controller.rb
@@ -3,7 +3,7 @@ class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
     before_action :authenticate_user!
     before_action :set_current_user
-    before_action :set_user_sites
+    before_action :set_person_sites
     before_action :set_domain
     before_action :set_site
 
@@ -13,8 +13,8 @@ def set_current_user
       @current_user = current_user
     end
 
-    def set_user_sites
-      @user_sites = @current_user.sites if @current_user.present?
+    def set_person_sites
+      @person_sites = @current_user.sites if @current_user.present?
     end
 
     def set_domain
diff --git a/app/controllers/cas/sites/people_controller.rb b/app/controllers/cas/sites/people_controller.rb
new file mode 100644
index 0000000..fb50cc0
--- /dev/null
+++ b/app/controllers/cas/sites/people_controller.rb
@@ -0,0 +1,75 @@
+require_dependency "cas/application_controller"
+
+module Cas
+  class Sites::PeopleController < Sites::ApplicationController
+    def index
+      @people = @site.people.order('name ASC')
+    end
+
+    def new
+      @person = ::Cas::Person.new
+      get_selected_sites
+    end
+
+    def create
+      @person = ::Cas::Person.new(person_params)
+      @person.roles = person_params[:roles]
+      @person.site_ids = person_params[:site_ids]
+      if @person.save
+        redirect_to site_people_url(@site)
+      else
+        get_selected_sites
+        render :new
+      end
+    end
+
+    def edit
+      @person = ::Cas::Person.find(params[:id])
+      get_selected_sites
+    end
+
+    def update
+      @person = ::Cas::Person.find(params[:id])
+      success = nil
+      @person.site_ids = person_params[:site_ids]
+      if person_params[:password].blank? && person_params[:password_confirmation].blank?
+        without_password = person_params.except(:password, :password_confirmation)
+        success = @person.update_without_password(without_password)
+      else
+        success = @person.update_attributes(person_params)
+      end
+
+      if success
+        redirect_to site_people_url(@site)
+      else
+        get_selected_sites
+        render 'edit'
+      end
+    end
+
+    private
+
+    def person_params
+      site_ids = Array.wrap(params[:person][:site_ids]) << @site.id
+      params
+        .require(:person)
+        .permit(
+          :name,
+          :email,
+          :site_ids,
+          :password,
+          :password_confirmation,
+          :roles,
+        )
+        .merge!(
+          roles: [params[:person][:roles]],
+          site_ids: (site_ids).uniq.keep_if(&:present?)
+        )
+    end
+
+    def get_selected_sites
+      @selected_sites = @person.sites.map(&:id)
+      @selected_sites << @site.id if @person.new_record?
+    end
+  end
+end
diff --git a/app/controllers/cas/sites/sections/contents_controller.rb b/app/controllers/cas/sites/sections/contents_controller.rb
index aff189c..85a7e0d 100644
--- a/app/controllers/cas/sites/sections/contents_controller.rb
+++ b/app/controllers/cas/sites/sections/contents_controller.rb
@@ -25,7 +25,7 @@ def create
           @content.section_id = @section.id
           @content.tag_list = content_params[:tag_list] if content_params[:tag_list]
           success = @content.save!
-          ::Cas::Activity.create!(user: current_user, site: @site, subject: @content, event_name: 'create')
+          ::Cas::Activity.create!(person: current_user, site: @site, subject: @content, event_name: 'create')
           associate_files(@content, :images)
           associate_files(@content, :attachments)
         end
@@ -63,7 +63,7 @@ def update
           success = @content.update!(content_params)
           associate_files(@content, :images)
           associate_files(@content, :attachments)
-          ::Cas::Activity.create!(user: current_user, site: @site, subject: @content, event_name: 'update')
+          ::Cas::Activity.create!(person: current_user, site: @site, subject: @content, event_name: 'update')
         end
       rescue ActiveRecord::RecordInvalid
         success = nil
diff --git a/app/controllers/cas/sites/users_controller.rb b/app/controllers/cas/sites/users_controller.rb
deleted file mode 100644
index c0a07f7..0000000
--- a/app/controllers/cas/sites/users_controller.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require_dependency "cas/application_controller"
-
-module Cas
-  class Sites::UsersController < Sites::ApplicationController
-    def index
-      @users = @site.users.order('name ASC')
-    end
-
-    def new
-      @user = ::Cas::User.new
-      get_selected_sites
-    end
-
-    def create
-      @user = ::Cas::User.new(user_params)
-      @user.roles = user_params[:roles]
-      @user.site_ids = user_params[:site_ids]
-      if @user.save
-        redirect_to site_users_url(@site)
-      else
-        get_selected_sites
-        render :new
-      end
-    end
-
-    def edit
-      @user = ::Cas::User.find(params[:id])
-      get_selected_sites
-    end
-
-    def update
-      @user = ::Cas::User.find(params[:id])
-      success = nil
-      @user.site_ids = user_params[:site_ids]
-      if user_params[:password].blank? && user_params[:password_confirmation].blank?
-        without_password = user_params.except(:password, :password_confirmation)
-        success = @user.update_without_password(without_password)
-      else
-        success = @user.update_attributes(user_params)
-      end
-
-      if success
-        redirect_to site_users_url(@site)
-      else
-        get_selected_sites
-        render 'edit'
-      end
-    end
-
-    private
-
-    def user_params
-      site_ids = Array.wrap(params[:user][:site_ids]) << @site.id
-      params
-        .require(:user)
-        .permit(
-          :name,
-          :email,
-          :site_ids,
-          :password,
-          :password_confirmation,
-          :roles,
-        )
-        .merge!(
-          roles: [params[:user][:roles]],
-          site_ids: (site_ids).uniq.keep_if(&:present?)
-        )
-    end
-
-    def get_selected_sites
-      @selected_sites = @user.sites.map(&:id)
-      @selected_sites << @site.id if @user.new_record?
-    end
-  end
-end
diff --git a/app/models/cas/activity.rb b/app/models/cas/activity.rb
index 60cac7e..6581f21 100644
--- a/app/models/cas/activity.rb
+++ b/app/models/cas/activity.rb
@@ -1,7 +1,7 @@
 module Cas
   class Activity < ApplicationRecord
     belongs_to :site
-    belongs_to :user
+    belongs_to :person
     belongs_to :subject, polymorphic: true
   end
 end
diff --git a/app/models/cas/content.rb b/app/models/cas/content.rb
index 969c4c0..7719051 100644
--- a/app/models/cas/content.rb
+++ b/app/models/cas/content.rb
@@ -11,8 +11,8 @@ class Content < ApplicationRecord
     belongs_to :section
     has_one :site, through: :section
     belongs_to :category
-    belongs_to :author, class_name: "::Cas::User"
-    has_many :images, ->{ where(media_type: :image).order("cas_media_files.order ASC") }, class_name: "::Cas::MediaFile", as: :attachable, dependent: :destroy
+    belongs_to :author, class_name: "::Cas::Person"
+    has_many :images, ->{ where(media_type: :image).order("cas_media_files.order ASC") }, class_name: Cas::MediaFile, as: :attachable, dependent: :destroy
     has_many :attachments, ->{ where(media_type: :attachment).order("cas_media_files.order ASC") }, class_name: "::Cas::MediaFile", as: :attachable, dependent: :destroy
     has_many :activities, as: :subject
     has_one :cover_image, ->{ where(media_type: :image, cover: true) }, class_name: "::Cas::MediaFile", as: :attachable
diff --git a/app/models/cas/media_file.rb b/app/models/cas/media_file.rb
index 75567de..591ffbb 100644
--- a/app/models/cas/media_file.rb
+++ b/app/models/cas/media_file.rb
@@ -6,7 +6,7 @@ class UnknownPath < StandardError; end
     class UnknownFileService < StandardError; end
 
     belongs_to :attachable, polymorphic: true
-    belongs_to :author, class_name: "::Cas::User"
+    belongs_to :author, class_name: "Cas::Person"
 
     before_validation :set_media_type
     before_save :set_image_as_unique_cover
diff --git a/app/models/cas/people_site.rb b/app/models/cas/people_site.rb
new file mode 100644
index 0000000..8d19b57
--- /dev/null
+++ b/app/models/cas/people_site.rb
@@ -0,0 +1,7 @@
+module Cas
+  class PeopleSite < ApplicationRecord
+    belongs_to :site
+    belongs_to :person
+    belongs_to :owner, class_name: '::Cas::Person'
+  end
+end
diff --git a/app/models/cas/user.rb b/app/models/cas/person.rb
similarity index 83%
rename from app/models/cas/user.rb
rename to app/models/cas/person.rb
index 4041d38..5cfccfd 100644
--- a/app/models/cas/user.rb
+++ b/app/models/cas/person.rb
@@ -1,14 +1,14 @@
 module Cas
-  class User < ApplicationRecord
-    ROLES = %w[admin editor writer].freeze
+  class Person < ApplicationRecord
+    ROLES = %w[admin editor writer visitor].freeze
 
     devise :database_authenticatable, #:recoverable,
            :rememberable, :trackable, :validatable, request_keys: [:domain]
 
     has_many :contents
-    has_many :files, class_name: '::Cas::MediaFile', as: :attachable
-    has_many :sites_users, class_name: '::Cas::SitesUser'
-    has_many :sites, through: :sites_users
+    has_many :files, class_name: 'Cas::MediaFile', as: :attachable
+    has_many :people_site, class_name: 'Cas::PeopleSite'
+    has_many :sites, through: :people_site
     has_many :activities, as: :subject
 
     validates :name, presence: true, length: { maximum: 50 }
diff --git a/app/models/cas/site.rb b/app/models/cas/site.rb
index b45fd4a..318727f 100644
--- a/app/models/cas/site.rb
+++ b/app/models/cas/site.rb
@@ -4,7 +4,7 @@ class Site < ApplicationRecord
     friendly_id :name, use: :slugged
 
     has_many :sections, dependent: :destroy
-    has_many :sites_users, class_name: '::Cas::SitesUser'
-    has_many :users, through: :sites_users
+    has_many :people_site, class_name: '::Cas::PeopleSite'
+    has_many :people, through: :people_site
   end
 end
diff --git a/app/models/cas/sites_user.rb b/app/models/cas/sites_user.rb
deleted file mode 100644
index c026700..0000000
--- a/app/models/cas/sites_user.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Cas
-  class SitesUser < ApplicationRecord
-    belongs_to :site
-    belongs_to :user
-    belongs_to :owner, class_name: '::Cas::User'
-  end
-end
diff --git a/app/views/cas/activities/index.html.erb b/app/views/cas/activities/index.html.erb
index 71aea0b..57d70cc 100644
--- a/app/views/cas/activities/index.html.erb
+++ b/app/views/cas/activities/index.html.erb
@@ -24,7 +24,7 @@
         <%= activity.site.name %>
       </td>
       <td>
-        <strong><%= activity.user.name %></strong>
+        <strong><%= activity.person.name %></strong>
         <% if activity.event_name == 'create' %>
           criou
         <% elsif activity.event_name == 'update'%>
diff --git a/app/views/cas/sites/users/_form.html.erb b/app/views/cas/sites/people/_form.html.erb
similarity index 81%
rename from app/views/cas/sites/users/_form.html.erb
rename to app/views/cas/sites/people/_form.html.erb
index 67c634b..4940023 100644
--- a/app/views/cas/sites/users/_form.html.erb
+++ b/app/views/cas/sites/people/_form.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for [@site, @user] do |f| %>
+<%= simple_form_for [@site, @person] do |f| %>
   <%= f.input :name %><br />
   <%= f.input :email %><br />
 
@@ -16,7 +16,7 @@
   <% end %>
 
   <% if current_user.admin? %>
-    <%= f.collection_select :roles, Cas::User::ROLES, :to_s, :humanize %></p>
+    <%= f.collection_select :roles, Cas::Person::ROLES, :to_s, :humanize %></p>
   <% end %>
   <%= f.input :password, required: false %><br />
   <%= f.input :password_confirmation %><br />
diff --git a/app/views/cas/sites/users/edit.html.erb b/app/views/cas/sites/people/edit.html.erb
similarity index 100%
rename from app/views/cas/sites/users/edit.html.erb
rename to app/views/cas/sites/people/edit.html.erb
diff --git a/app/views/cas/sites/people/index.html.erb b/app/views/cas/sites/people/index.html.erb
new file mode 100644
index 0000000..660ae26
--- /dev/null
+++ b/app/views/cas/sites/people/index.html.erb
@@ -0,0 +1,34 @@
+<div class="grid">
+  <div class="col-1-2">
+    <h1>Pessoas</h1>
+  </div>
+  <div class="col-1-2 section-options">
+  </div>
+</div>
+
+<%= link_to "Nova Pessoa", new_site_person_path(@site) if current_user.admin? %>
+
+<br />
+<br />
+
+<table>
+  <thead>
+    <tr>
+      <th>Nome</th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @people.each do |person| %>
+      <tr id="person-<%= person.id %>">
+        <td>
+          <%= link_to person.name,
+            edit_site_person_url(@site, person),
+            id: "edit-person-#{person.id}" %>
+        </td>
+        <td><%= person.roles.join(", ") %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
diff --git a/app/views/cas/sites/users/new.html.erb b/app/views/cas/sites/people/new.html.erb
similarity index 100%
rename from app/views/cas/sites/users/new.html.erb
rename to app/views/cas/sites/people/new.html.erb
diff --git a/app/views/cas/sites/sections/index.html.erb b/app/views/cas/sites/sections/index.html.erb
index 7107d1f..2937634 100644
--- a/app/views/cas/sites/sections/index.html.erb
+++ b/app/views/cas/sites/sections/index.html.erb
@@ -7,7 +7,7 @@
   </thead>
 
   <% @sections.each do |section| %>
-    <% next unless Cas::SectionConfig.new(section).accessible_by_user?(current_user) %>
+    <% next unless Cas::SectionConfig.new(section).accessible_by_person?(current_user) %>
     <tr id="section-<%= section.id %>">
       <td><%= section.name %></td>
       <td>
diff --git a/app/views/cas/sites/users/index.html.erb b/app/views/cas/sites/users/index.html.erb
deleted file mode 100644
index e962e77..0000000
--- a/app/views/cas/sites/users/index.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="grid">
-  <div class="col-1-2">
-    <h1>Usuários</h1>
-  </div>
-  <div class="col-1-2 section-options">
-  </div>
-</div>
-
-<%= link_to "Novo Usuário", new_site_user_path(@site) if current_user.admin? %>
-
-<br />
-<br />
-
-<table>
-  <thead>
-    <tr>
-      <th>Nome</th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @users.each do |user| %>
-        <tr id="user-<%= user.id %>">
-          <td>
-            <%= link_to user.name,
-              edit_site_user_path(@site, user),
-              id: "edit-user-#{user.id}" %>
-          </td>
-          <td><%= user.roles.join(", ") %></td>
-        </tr>
-    <% end %>
-  </tbody>
-</table>
diff --git a/app/views/layouts/cas/application.html.erb b/app/views/layouts/cas/application.html.erb
index a67da40..28b94c4 100644
--- a/app/views/layouts/cas/application.html.erb
+++ b/app/views/layouts/cas/application.html.erb
@@ -38,11 +38,11 @@
 
       <% if user_signed_in? %>
         <div class="mobile-col-1-1 col-1-3 site-selector">
-          <% if @user_sites.count <= 1 %>
-            <%= @user_sites[0].name %> (<%= @user_sites[0].domains.join(", ") %>)
+          <% if @person_sites.count <= 1 %>
+            <%= @person_sites[0].name %> (<%= @person_sites[0].domains.join(", ") %>)
           <% else %>
             <select id="select-site">
-              <% @user_sites.each do |site| %>
+              <% @person_sites.each do |site| %>
                 <% selected = site.id == @site&.id %>
                 <option
                   value="<%= site_sections_path(site) %>"
@@ -57,7 +57,7 @@
         </div>
         <div class="mobile-col-1-1 col-1-3 secondary">
           <span class="profile">
-            <%= link_to "Minha conta", cas.edit_site_user_path(@site, current_user), id: "edit-profile"%>
+            <%= link_to "Minha conta", cas.edit_site_person_path(@site, current_user), id: "edit-profile"%>
           </span>
           <span class="sign-out"%>
             <%= link_to "Sair", cas.destroy_user_session_path, method: :delete %>
@@ -73,7 +73,7 @@
           <li><%= link_to "Atividades", cas.activities_path, id: "go-to-activities" %></li>
         <% end %>
         <% if user_signed_in? && current_user.admin? %>
-          <li><%= link_to "Pessoas", cas.site_users_path(@site), id: "list-people" %></li>
+          <li><%= link_to "Pessoas", cas.site_people_path(@site), id: "list-people" %></li>
         <% end %>
       </ul>
     </nav>
diff --git a/config/routes.rb b/config/routes.rb
index 3cb805e..7fff576 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,14 +9,14 @@
   end
 
   devise_for :users,
-    class_name: "Cas::User",
+    class_name: "Cas::Person",
     module: :devise,
     controllers: { sessions: "cas/devise/sessions" },
     skip: :registrations
 
   resources :activities, only: [:index]
   resources :sites, only: [:index] do
-    resources :users, controller: 'sites/users'
+    resources :people, controller: 'sites/people'
 
     resources :sections, only: [:index], controller: 'sites/sections' do
       resources :contents, controller: 'sites/sections/contents'
diff --git a/db/migrate/20180123173810_alter_cas_users_to_cas_people.rb b/db/migrate/20180123173810_alter_cas_users_to_cas_people.rb
new file mode 100644
index 0000000..3a6aeb0
--- /dev/null
+++ b/db/migrate/20180123173810_alter_cas_users_to_cas_people.rb
@@ -0,0 +1,12 @@
+class AlterCasUsersToCasPeople < ActiveRecord::Migration[5.0]
+  def change
+    remove_index :cas_activities, :user_id
+    rename_column :cas_activities, :user_id, :person_id
+    remove_index :cas_sites_users, [:site_id, :user_id]
+    rename_table :cas_users, :cas_people
+    rename_table :cas_sites_users, :cas_people_sites
+    rename_column :cas_people_sites, :user_id, :person_id
+    add_index :cas_people_sites, [:site_id, :person_id]
+    add_index :cas_activities, :person_id
+  end
+end
diff --git a/lib/cas/section_config.rb b/lib/cas/section_config.rb
index bf119d4..9a1c2c7 100644
--- a/lib/cas/section_config.rb
+++ b/lib/cas/section_config.rb
@@ -14,8 +14,8 @@ def list_fields
       fields || ['title', 'created_at']
     end
 
-    def accessible_by_user?(user)
-      roles = user.roles.map(&:to_s)
+    def accessible_by_person?(person)
+      roles = person.roles.map(&:to_s)
       accessible_roles = load_field["accessible_roles"]
 
       if accessible_roles.present?
diff --git a/lib/cas/setup.rb b/lib/cas/setup.rb
index 848d555..a49a056 100644
--- a/lib/cas/setup.rb
+++ b/lib/cas/setup.rb
@@ -28,18 +28,18 @@ def install
         end
 
         if superadmins_emails_or_logins = config["config"]["superadmins"]
-          updated_users = []
+          updated_people = []
           superadmins_emails_or_logins.each do |email_or_login|
-            user = ::Cas::User.where(
-              'cas_users.email = :value OR cas_users.login = :value',
+            person = ::Cas::Person.where(
+              'cas_people.email = :value OR cas_people.login = :value',
               value: email_or_login
             ).first
 
-            if user.present?
-              unless updated_users.include?(user.id)
-                user.update!(sites: ::Cas::Site.all)
+            if person.present?
+              unless updated_people.include?(person.id)
+                person.update!(sites: ::Cas::Site.all)
               end
-              updated_users << user.id
+              updated_people << person.id
             end
           end
         end
diff --git a/spec/acceptance/activities_spec.rb b/spec/acceptance/activities_spec.rb
index d65e9ea..cc4e12c 100644
--- a/spec/acceptance/activities_spec.rb
+++ b/spec/acceptance/activities_spec.rb
@@ -1,34 +1,37 @@
 require "rails_helper"
 
 RSpec.feature 'Activities' do
-  let(:admin)  { create(:user, :admin, sites: [site2]) }
-  let(:editor) { create(:user, :editor, sites: [site2]) }
-  let(:writer) { create(:user, :writer, sites: [site2]) }
+  let(:admin)  { create(:person, :admin, sites: [site2]) }
+  let(:editor) { create(:person, :editor, sites: [site2]) }
+  let(:writer) { create(:person, :writer, sites: [site2]) }
+
+  let(:site1) { create(:site, name: "mysite1", slug: "mysite1") }
+  let(:site2) { create(:site, name: "mysite", slug: "mysite", domains: ["mysite.com"]) }
+  let(:site3) { create(:site, name: "mysite3", slug: "mysite3") }
 
-  let(:site1) { create(:site, name: "mysite1") }
-  let(:site2) { create(:site, name: "mysite") }
-  let(:site3) { create(:site, name: "mysite3") }
   let(:section1) { create(:section, site: site1) }
   let(:section2) { create(:section, site: site2) }
   let(:section3) { create(:section, site: site3) }
+
   let(:content1) { create(:content, section: section1) }
   let(:content2) { create(:content, section: section2) }
   let(:content3) { create(:content, section: section3) }
-  let(:activity1) { create(:activity, site: site1, subject: content1, user: admin) }
-  let(:activity2) { create(:activity, site: site2, subject: content2, user: editor) }
-  let(:activity3) { create(:activity, site: site3, subject: content3, user: writer) }
+
+  let!(:activity1) { create(:activity, site: site1, subject: content1, person: admin) }
+  let!(:activity2) { create(:activity, site: site2, subject: content2, person: editor) }
+  let!(:activity3) { create(:activity, site: site3, subject: content3, person: writer) }
 
   background do
     activity1
     activity2
     activity3
-    Capybara.app_host = "http://#{site2.domains.first}"
-    login(user)
+    Capybara.app_host = "https://#{site2.domains.first}"
+    login(person)
     visit root_path
   end
 
   context 'As editor' do
-    let(:user) { editor }
+    let(:person) { editor }
 
     scenario 'I am able to see activities from the same website' do
       click_link "go-to-activities"
diff --git a/spec/acceptance/categories_spec.rb b/spec/acceptance/categories_spec.rb
index 93a9c27..b72f871 100644
--- a/spec/acceptance/categories_spec.rb
+++ b/spec/acceptance/categories_spec.rb
@@ -1,14 +1,14 @@
 require 'rails_helper'
 
 RSpec.feature 'Categories' do
-  let(:user) { create(:user, sites: [site]) }
-  let(:site) { section.site }
-  let!(:section) { create(:section) }
+  let(:person) { create(:person, sites: [site]) }
+  let(:site) { create(:site, :yml_name) }
+  let!(:section) { create(:section, site: site) }
   let!(:category) { create(:category, section: section) }
 
   context 'As admin' do
     background do
-      login(user)
+      login(person)
     end
 
     scenario "I create a category in a section" do
@@ -17,7 +17,7 @@
       click_link 'manage-categories'
       click_link 'new-category'
 
-      fill_in 'category_name', with: user.email
+      fill_in 'category_name', with: person.email
 
       expect do
         click_on 'submit'
diff --git a/spec/acceptance/contents_spec.rb b/spec/acceptance/contents_spec.rb
index 4904331..0ee17ea 100644
--- a/spec/acceptance/contents_spec.rb
+++ b/spec/acceptance/contents_spec.rb
@@ -1,26 +1,26 @@
 require "rails_helper"
 
 RSpec.feature 'Contents' do
-  let(:admin)  { create(:user, :admin, sites: [site]) }
-  let(:editor) { create(:user, :editor, sites: [site]) }
-  let(:writer) { create(:user, :writer, sites: [site]) }
+  let(:admin)  { create(:person, :admin, sites: [site]) }
+  let(:editor) { create(:person, :editor, sites: [site]) }
+  let(:writer) { create(:person, :writer, sites: [site]) }
 
-  let!(:site) { create(:site) }
+  let!(:site) { create(:site, :yml_name) }
   let!(:section) { create(:section, site: site) }
   let!(:survey_section) { create(:section, :survey, site: site) }
   let!(:agenda_section) { create(:section, :agenda, site: site) }
   let!(:category) { create(:category, section: section) }
-  let!(:content) { create(:content, section: section, author: user, category: category) }
+  let!(:content) { create(:content, section: section, author: person, category: category) }
   let!(:someone_else_content) { create(:content, section: section, author: someone_else, category: category) }
   let!(:file_orphan) { create(:file, attachable: nil) }
 
   background do
-    login(user)
+    login(person)
     visit root_path
   end
 
   context 'As admin' do
-    let(:user) { admin }
+    let(:person) { admin }
     let(:someone_else) { editor }
 
     context 'when visit news' do
@@ -48,7 +48,7 @@
         expect(last_content.images).to match_array [file_orphan]
 
         activity = Cas::Activity.last
-        expect(activity.user).to eq user
+        expect(activity.person).to eq person
         expect(activity.site).to eq site
         expect(activity.event_name).to eq 'create'
       end
@@ -271,7 +271,7 @@
   end
 
   context 'As editor' do
-    let(:user) { editor }
+    let(:person) { editor }
     let(:someone_else) { admin }
 
     scenario 'I am able to see everyones content' do
@@ -286,7 +286,7 @@
   end
 
   context 'As writer' do
-    let(:user) { writer }
+    let(:person) { writer }
     let(:someone_else) { admin }
 
     scenario 'I am able to see only my own content' do
diff --git a/spec/acceptance/users_sign_in_spec.rb b/spec/acceptance/people_sign_in_spec.rb
similarity index 93%
rename from spec/acceptance/users_sign_in_spec.rb
rename to spec/acceptance/people_sign_in_spec.rb
index 0446a0b..67b7c0d 100644
--- a/spec/acceptance/users_sign_in_spec.rb
+++ b/spec/acceptance/people_sign_in_spec.rb
@@ -1,7 +1,7 @@
 require "rails_helper"
 
-RSpec.feature 'User' do
-  let(:admin) { create(:user, :admin, sites: [site1, site2]) }
+RSpec.feature 'Person' do
+  let(:admin) { create(:person, :admin, sites: [site1, site2]) }
   let!(:site1) { create(:site, name: 'site1', domains: ['site1.com', 'site11.com']) }
   let!(:site2) { create(:site, name: 'site2', domains: ['site2.com']) }
   let!(:site3) { create(:site, name: 'site3', domains: ['site3.com']) }
diff --git a/spec/acceptance/users_spec.rb b/spec/acceptance/people_spec.rb
similarity index 51%
rename from spec/acceptance/users_spec.rb
rename to spec/acceptance/people_spec.rb
index 3739d00..e649efb 100644
--- a/spec/acceptance/users_spec.rb
+++ b/spec/acceptance/people_spec.rb
@@ -1,8 +1,8 @@
 require "rails_helper"
 
-RSpec.feature 'User' do
-  let(:admin) { create(:user, :admin, sites: [site, site2]) }
-  let!(:writer) { create(:user, :writer, sites: [site]) }
+RSpec.feature 'Person' do
+  let(:admin) { create(:person, :admin, sites: [site, site2]) }
+  let!(:writer) { create(:person, :writer, sites: [site]) }
   let!(:site) { create(:site) }
   let!(:site2) { create(:site, name: 'site2', domains: ['site2.com']) }
   let!(:site3) { create(:site, name: 'site3', domains: ['site3.com']) }
@@ -12,40 +12,40 @@
       login(admin)
     end
 
-    scenario 'I create a user' do
-      visit new_site_user_path(site)
+    scenario 'I create a person' do
+      visit new_site_person_path(site)
 
-      fill_in 'user[name]', with: "asd234"
-      fill_in 'user[email]', with: "asd234@asd.com"
+      fill_in 'person[name]', with: "asd234"
+      fill_in 'person[email]', with: "asd234@asd.com"
       check "site-id-#{site2.id}"
-      select 'Admin', from: :user_roles
-      fill_in 'user[password]', with: "123456"
-      fill_in 'user[password_confirmation]', with: "123456"
+      select 'Admin', from: :person_roles
+      fill_in 'person[password]', with: "123456"
+      fill_in 'person[password_confirmation]', with: "123456"
 
       expect do
         click_on 'save-form'
-      end.to change(::Cas::User, :count).by(1)
+      end.to change(::Cas::Person, :count).by(1)
 
       expect(admin.roles).to eq ["admin"]
 
-      new_user = ::Cas::User.where(name: "asd234").first!
-      expect(new_user.sites.map(&:name)).to match_array([site, site2].map(&:name))
+      new_person = ::Cas::Person.where(name: "asd234").first!
+      expect(new_person.sites.map(&:name)).to match_array([site, site2].map(&:name))
     end
 
-    scenario 'I edit an user' do
+    scenario 'I edit an person' do
       click_on "list-people"
-      click_on "edit-user-#{writer.id}"
+      click_on "edit-person-#{writer.id}"
 
-      fill_in 'user[name]', with: "asd2345"
-      fill_in 'user[email]', with: "asd2345@asd.com"
+      fill_in 'person[name]', with: "asd2345"
+      fill_in 'person[email]', with: "asd2345@asd.com"
       check "site-id-#{site2.id}"
-      select 'Admin', from: :user_roles
+      select 'Admin', from: :person_roles
       expect(writer.password).to eq "123456"
-      fill_in 'user[password]', with: "new passw"
-      fill_in 'user[password_confirmation]', with: "new passw"
+      fill_in 'person[password]', with: "new passw"
+      fill_in 'person[password_confirmation]', with: "new passw"
 
       click_on "save-form"
-      expect(current_path).to eq site_users_path(site)
+      expect(current_path).to eq site_people_path(site)
       writer.reload
       expect(writer.sites.map(&:name)).to match_array([site, site2].map(&:name))
       expect(writer.name).to eq "asd2345"
@@ -54,17 +54,17 @@
       expect(writer.valid_password?("new passw")).to eq true
     end
 
-    scenario "I edit an user without touching their password" do
+    scenario "I edit an person without touching their password" do
       click_on "list-people"
-      click_on "edit-user-#{writer.id}"
+      click_on "edit-person-#{writer.id}"
 
-      fill_in 'user[name]', with: "new name"
-      fill_in 'user[email]', with: "asd2345@asd.com"
+      fill_in 'person[name]', with: "new name"
+      fill_in 'person[email]', with: "asd2345@asd.com"
       check "site-id-#{site2.id}"
-      select 'Admin', from: :user_roles
+      select 'Admin', from: :person_roles
 
       click_on "save-form"
-      expect(current_path).to eq site_users_path(site)
+      expect(current_path).to eq site_people_path(site)
       writer.reload
       expect(writer.sites.map(&:name)).to match_array([site, site2].map(&:name))
       expect(writer.name).to eq "new name"
@@ -82,10 +82,10 @@
     scenario 'I edit my profile' do
       click_on "edit-profile"
 
-      fill_in 'user[name]', with: "asd2345"
-      fill_in 'user[email]', with: "asd2345@asd.com"
-      fill_in 'user[password]', with: "123456"
-      fill_in 'user[password_confirmation]', with: "123456"
+      fill_in 'person[name]', with: "asd2345"
+      fill_in 'person[email]', with: "asd2345@asd.com"
+      fill_in 'person[password]', with: "123456"
+      fill_in 'person[password_confirmation]', with: "123456"
 
       click_on "save-form"
       writer.reload
diff --git a/spec/factories/activity.rb b/spec/factories/activity.rb
index e2e6776..20ab586 100644
--- a/spec/factories/activity.rb
+++ b/spec/factories/activity.rb
@@ -1,6 +1,7 @@
 FactoryGirl.define do
-  factory :activity, class: Cas::Activity do
-    association :user
+  factory :activity, class: ::Cas::Activity do
+    association :person
+    association :site
     association :subject, factory: :content
     event_name 'create'
   end
diff --git a/spec/factories/content.rb b/spec/factories/content.rb
index 6c676f3..1c926e1 100644
--- a/spec/factories/content.rb
+++ b/spec/factories/content.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :content, class: Cas::Content do
-    association :author, factory: :user
+    association :author, factory: :person
     association :section
     sequence(:title) { |n| "Content #{n}" }
     summary 'summary content'
diff --git a/spec/factories/media_file.rb b/spec/factories/media_file.rb
index 56d4f1c..08e7443 100644
--- a/spec/factories/media_file.rb
+++ b/spec/factories/media_file.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :file, class: Cas::MediaFile do
-    association :author, factory: :user
+    association :author, factory: :person
     association :attachable, factory: :content
     description 'summary content'
     service 's3'
diff --git a/spec/factories/user.rb b/spec/factories/person.rb
similarity index 88%
rename from spec/factories/user.rb
rename to spec/factories/person.rb
index 881b7e4..0c5b15f 100644
--- a/spec/factories/user.rb
+++ b/spec/factories/person.rb
@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :user, class: Cas::User do
+  factory :person, class: ::Cas::Person do
     name "John Wayne"
     sequence(:email) { |n| "wayne#{n}@wayneenterprises.co" }
     login "my_username"
diff --git a/spec/factories/site.rb b/spec/factories/site.rb
index 22aca46..12b13fe 100644
--- a/spec/factories/site.rb
+++ b/spec/factories/site.rb
@@ -1,6 +1,11 @@
 FactoryGirl.define do
-  factory :site, class: Cas::Site do
-    sequence(:name) { |n| "mysite#{n if n > 1}" }
-    sequence(:domains) { |n| ["example.com#{n if n > 1}"] }
+  factory :site, class: ::Cas::Site do
+    sequence(:name) { |n| "mysite-#{n}" }
+    domains ['example.com']
+
+    trait :yml_name do
+      name "mysite"
+      slug "mysite"
+    end
   end
 end
diff --git a/spec/lib/cas/form_field_spec.rb b/spec/lib/cas/form_field_spec.rb
index eccd4d6..c3bb68b 100644
--- a/spec/lib/cas/form_field_spec.rb
+++ b/spec/lib/cas/form_field_spec.rb
@@ -4,7 +4,8 @@ module Cas
   RSpec.describe FormField do
     let(:slug) { 'agenda' }
     let(:field) { 'title' }
-    let(:section) { build(:section, slug: slug) }
+    let(:site) { build(:site, :yml_name) }
+    let(:section) { build(:section, site: site, slug: slug) }
 
     subject { described_class.new(section, field) }
 
diff --git a/spec/lib/cas/section_config_spec.rb b/spec/lib/cas/section_config_spec.rb
index cfdf3a5..8f7b2c1 100644
--- a/spec/lib/cas/section_config_spec.rb
+++ b/spec/lib/cas/section_config_spec.rb
@@ -3,47 +3,48 @@
 module Cas
   RSpec.describe SectionConfig do
     let(:slug) { 'news' }
-    let(:section) { build(:section, slug: slug) }
+    let(:site) { build(:site, :yml_name) }
+    let(:section) { build(:section, site: site, slug: slug) }
 
     subject { described_class.new(section) }
 
-    describe '#accessible_by_user?' do
+    describe '#accessible_by_person?' do
       context 'when accessible by admin only' do
-        let(:section) { build(:section, :agenda) }
+        let(:section) { build(:section, :agenda, site: site) }
 
-        context 'when user is a admin' do
-          let(:user) { build(:user, :admin) }
+        context 'when person is a admin' do
+          let(:person) { build(:person, :admin) }
 
           it 'returns true' do
-            expect(subject).to be_accessible_by_user(user)
+            expect(subject).to be_accessible_by_person(person)
           end
         end
 
-        context 'when user is a writer' do
-          let(:user) { build(:user, :writer) }
+        context 'when person is a writer' do
+          let(:person) { build(:person, :writer) }
 
           it 'returns false' do
-            expect(subject).to_not be_accessible_by_user(user)
+            expect(subject).to_not be_accessible_by_person(person)
           end
         end
       end
 
       context 'when accessible by anyone' do
-        let(:section) { build(:section, :news) }
+        let(:section) { build(:section, :news, site: site) }
 
-        context 'when user is a admin' do
-          let(:user) { build(:user, :admin) }
+        context 'when person is a admin' do
+          let(:person) { build(:person, :admin) }
 
           it 'returns true' do
-            expect(subject).to be_accessible_by_user(user)
+            expect(subject).to be_accessible_by_person(person)
           end
         end
 
-        context 'when user is a writer' do
-          let(:user) { build(:user, :writer) }
+        context 'when person is a writer' do
+          let(:person) { build(:person, :writer) }
 
           it 'returns true' do
-            expect(subject).to be_accessible_by_user(user)
+            expect(subject).to be_accessible_by_person(person)
           end
         end
       end
diff --git a/spec/lib/cas/setup_spec.rb b/spec/lib/cas/setup_spec.rb
index 4d43c0f..059d54a 100644
--- a/spec/lib/cas/setup_spec.rb
+++ b/spec/lib/cas/setup_spec.rb
@@ -3,9 +3,9 @@
 module Cas
   RSpec.describe Setup do
     describe '#install' do
-      let!(:superadmin) { create(:user, email: 'superadmin@example.com') }
-      let!(:superadmin2) { create(:user, login: 'superadmin-login') }
-      let!(:user) { create(:user, email: 'user@example.com') }
+      let!(:superadmin) { create(:person, email: 'superadmin@example.com') }
+      let!(:superadmin2) { create(:person, login: 'superadmin-login') }
+      let!(:person) { create(:person, email: 'person@example.com') }
 
       before do
         expect(Section.count).to eq 0
@@ -46,11 +46,11 @@ module Cas
         it 'adds all sites to all superadmins' do
           expect(superadmin.sites).to be_blank
           expect(superadmin2.sites).to be_blank
-          expect(user.sites).to be_blank
+          expect(person.sites).to be_blank
           subject.install
           expect(superadmin.reload.sites).to match_array(::Cas::Site.all)
           expect(superadmin2.reload.sites).to match_array(::Cas::Site.all)
-          expect(user.reload.sites).to be_blank
+          expect(person.reload.sites).to be_blank
         end
       end
 
diff --git a/spec/models/cas/user_spec.rb b/spec/models/cas/person_spec.rb
similarity index 71%
rename from spec/models/cas/user_spec.rb
rename to spec/models/cas/person_spec.rb
index bc7bf59..57b7f8a 100644
--- a/spec/models/cas/user_spec.rb
+++ b/spec/models/cas/person_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 module Cas
-  RSpec.describe User, type: :model do
+  RSpec.describe Person, type: :model do
     pending "add some examples to (or delete) #{__FILE__}"
   end
 end
diff --git a/spec/support/devise_support.rb b/spec/support/devise_support.rb
index 1f6086b..b3c5b30 100644
--- a/spec/support/devise_support.rb
+++ b/spec/support/devise_support.rb
@@ -1,6 +1,6 @@
 module DeviseSupport
   def sign_in
-    @user ||= FactoryGirl.create(:user)
+    @user ||= FactoryGirl.create(:person)
 
     # We action the login request using the parameters before we begin.
     # The login requests will match these to the user we just created in the factory, and authenticate us.
diff --git a/spec/test_app/db/schema.rb b/spec/test_app/db/schema.rb
index 0e468bc..cc0256a 100644
--- a/spec/test_app/db/schema.rb
+++ b/spec/test_app/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180114124600) do
+ActiveRecord::Schema.define(version: 20180123173810) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -21,15 +21,15 @@
 
   create_table "cas_activities", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.uuid     "site_id"
-    t.uuid     "user_id"
+    t.uuid     "person_id"
     t.string   "event_name"
     t.uuid     "subject_id"
     t.string   "subject_type"
     t.datetime "created_at",   null: false
     t.datetime "updated_at",   null: false
+    t.index ["person_id"], name: "index_cas_activities_on_person_id", using: :btree
     t.index ["site_id"], name: "index_cas_activities_on_site_id", using: :btree
     t.index ["subject_id", "subject_type"], name: "index_cas_activities_on_subject_id_and_subject_type", using: :btree
-    t.index ["user_id"], name: "index_cas_activities_on_user_id", using: :btree
   end
 
   create_table "cas_categories", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
@@ -96,6 +96,40 @@
     t.index ["cover"], name: "index_cas_media_files_on_cover", using: :btree
   end
 
+  create_table "cas_people", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
+    t.string   "name",                                null: false
+    t.string   "login"
+    t.uuid     "author_id"
+    t.string   "roles",                  default: [],              array: true
+    t.datetime "created_at",                          null: false
+    t.datetime "updated_at",                          null: false
+    t.string   "email"
+    t.string   "encrypted_password",     default: "", null: false
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",          default: 0,  null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.jsonb    "metadata",               default: {}
+    t.index ["author_id"], name: "index_cas_people_on_author_id", using: :btree
+    t.index ["email"], name: "index_cas_people_on_email", unique: true, using: :btree
+    t.index ["encrypted_password"], name: "index_cas_people_on_encrypted_password", using: :btree
+    t.index ["reset_password_token"], name: "index_cas_people_on_reset_password_token", unique: true, using: :btree
+  end
+
+  create_table "cas_people_sites", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
+    t.uuid     "person_id",  null: false
+    t.uuid     "site_id",    null: false
+    t.boolean  "author_id"
+    t.boolean  "uuid"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["site_id", "person_id"], name: "index_cas_people_sites_on_site_id_and_person_id", using: :btree
+  end
+
   create_table "cas_sections", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string   "name",         null: false
     t.string   "section_type", null: false
@@ -118,40 +152,6 @@
     t.index ["slug"], name: "index_cas_sites_on_slug", unique: true, using: :btree
   end
 
-  create_table "cas_sites_users", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
-    t.uuid     "user_id",    null: false
-    t.uuid     "site_id",    null: false
-    t.boolean  "author_id"
-    t.boolean  "uuid"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["site_id", "user_id"], name: "index_cas_sites_users_on_site_id_and_user_id", using: :btree
-  end
-
-  create_table "cas_users", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
-    t.string   "name",                                null: false
-    t.string   "login"
-    t.uuid     "author_id"
-    t.string   "roles",                  default: [],              array: true
-    t.datetime "created_at",                          null: false
-    t.datetime "updated_at",                          null: false
-    t.string   "email"
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.jsonb    "metadata",               default: {}
-    t.index ["author_id"], name: "index_cas_users_on_author_id", using: :btree
-    t.index ["email"], name: "index_cas_users_on_email", unique: true, using: :btree
-    t.index ["encrypted_password"], name: "index_cas_users_on_encrypted_password", using: :btree
-    t.index ["reset_password_token"], name: "index_cas_users_on_reset_password_token", unique: true, using: :btree
-  end
-
   create_table "taggings", force: :cascade do |t|
     t.integer  "tag_id"
     t.string   "taggable_type"