From ecd677e827e653b9d9787c2c7b38eaeb2a66bdbc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 20 Jan 2026 00:44:42 +0000
Subject: [PATCH 1/5] Initial plan


From c8a0675040a94ce668d5d7b221044cb16e18e4f4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 20 Jan 2026 00:51:34 +0000
Subject: [PATCH 2/5] Create migrations and new Organization models/controllers

Co-authored-by: maebeale <7607813+maebeale@users.noreply.github.com>
---
 .../organization_statuses_controller.rb       |  68 +++++++++
 .../organization_users_controller.rb          |  13 ++
 app/controllers/organizations_controller.rb   | 137 ++++++++++++++++++
 app/decorators/organization_decorator.rb      |  29 ++++
 .../organization_status_decorator.rb          |   3 +
 app/decorators/organization_user_decorator.rb |   5 +
 app/models/community_news.rb                  |   2 +-
 app/models/organization.rb                    | 107 ++++++++++++++
 app/models/organization_obligation.rb         |   5 +
 app/models/organization_status.rb             |   7 +
 app/models/organization_user.rb               |  17 +++
 app/models/report.rb                          |   2 +-
 app/models/story.rb                           |   2 +-
 app/models/story_idea.rb                      |  10 +-
 app/models/user.rb                            |  22 +--
 app/models/workshop_log.rb                    |   4 +-
 config/routes.rb                              |   5 +-
 ...004745_rename_projects_to_organizations.rb |  59 ++++++++
 18 files changed, 473 insertions(+), 24 deletions(-)
 create mode 100644 app/controllers/organization_statuses_controller.rb
 create mode 100644 app/controllers/organization_users_controller.rb
 create mode 100644 app/controllers/organizations_controller.rb
 create mode 100644 app/decorators/organization_decorator.rb
 create mode 100644 app/decorators/organization_status_decorator.rb
 create mode 100644 app/decorators/organization_user_decorator.rb
 create mode 100644 app/models/organization.rb
 create mode 100644 app/models/organization_obligation.rb
 create mode 100644 app/models/organization_status.rb
 create mode 100644 app/models/organization_user.rb
 create mode 100644 db/migrate/20260120004745_rename_projects_to_organizations.rb

diff --git a/app/controllers/organization_statuses_controller.rb b/app/controllers/organization_statuses_controller.rb
new file mode 100644
index 000000000..bf7441d60
--- /dev/null
+++ b/app/controllers/organization_statuses_controller.rb
@@ -0,0 +1,68 @@
+class OrganizationStatusesController < Admin::BaseController
+  before_action :set_organization_status, only: [ :show, :edit, :update, :destroy ]
+
+  def index
+    per_page = params[:number_of_items_per_page].presence || 25
+    unfiltered = OrganizationStatus.all
+    @count_display = unfiltered.count
+    @organization_statuses = unfiltered.paginate(page: params[:page], per_page: per_page).decorate
+  end
+
+  def show
+    @organization_status = @organization_status.decorate
+  end
+
+  def new
+    @organization_status = OrganizationStatus.new.decorate
+    set_form_variables
+  end
+
+  def edit
+    @organization_status = @organization_status.decorate
+    set_form_variables
+  end
+
+  def create
+    @organization_status = OrganizationStatus.new(organization_status_params)
+
+    if @organization_status.save
+      redirect_to organization_statuses_path, notice: "Organization status was successfully created."
+    else
+      @organization_status = OrganizationStatus.new.decorate
+      set_form_variables
+      render :new, status: :unprocessable_content
+    end
+  end
+
+  def update
+    if @organization_status.update(organization_status_params)
+      redirect_to organization_statuses_path, notice: "Organization status was successfully updated.", status: :see_other
+    else
+      @organization_status = OrganizationStatus.new.decorate
+      set_form_variables
+      render :edit, status: :unprocessable_content
+    end
+  end
+
+  def destroy
+    @organization_status.destroy!
+    redirect_to organization_statuses_path, notice: "Organization status was successfully destroyed."
+  end
+
+  # Optional hooks for setting variables for forms or index
+  def set_form_variables
+  end
+
+  private
+
+  def set_organization_status
+    @organization_status = OrganizationStatus.find(params[:id])
+  end
+
+  # Strong parameters
+  def organization_status_params
+    params.require(:organization_status).permit(
+      :name
+    )
+  end
+end
diff --git a/app/controllers/organization_users_controller.rb b/app/controllers/organization_users_controller.rb
new file mode 100644
index 000000000..400a3db27
--- /dev/null
+++ b/app/controllers/organization_users_controller.rb
@@ -0,0 +1,13 @@
+class OrganizationUsersController < ApplicationController
+  def destroy
+    organization_user = OrganizationUser.find(params[:id])
+    user = organization_user.user
+
+    if organization_user.destroy
+      flash[:notice] = "Organization user has been deleted."
+    else
+      flash[:alert] = "Unable to delete organization user.  Please contact AWBW."
+    end
+    redirect_to generate_facilitator_user_path(user)
+  end
+end
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
new file mode 100644
index 000000000..179e427a1
--- /dev/null
+++ b/app/controllers/organizations_controller.rb
@@ -0,0 +1,137 @@
+class OrganizationsController < ApplicationController
+  before_action :set_organization, only: [ :show, :edit, :update, :destroy ]
+
+  def index
+    per_page = params[:number_of_items_per_page].presence || 25
+    unpaginated = Organization.search_by_params(params).order(:name)
+    @organizations_count = unpaginated.count
+    @organizations = unpaginated.paginate(page: params[:page], per_page: per_page)
+    set_index_variables
+  end
+
+  def show
+    @organization.increment_view_count!(session: session, request: request)
+
+    # Reuse WorkshopLogsController#index logic programmatically
+    workshop_logs_controller = WorkshopLogsController.new
+    workshop_logs_controller.request = request
+    workshop_logs_controller.response = response
+    params[:organization_id] = @organization.id  # Inject context so the WorkshopLogsController#index scopes properly
+    workshop_logs_controller.params = params
+    workshop_logs_controller.index
+
+    workshop_logs = WorkshopLog.where(organization_id: @organization.id)
+    @month_year_options = workshop_logs.group("DATE_FORMAT(COALESCE(date, created_at, NOW()), '%Y-%m')")
+                                     .select("DATE_FORMAT(COALESCE(date, created_at, NOW()), '%Y-%m') AS ym,
+           MAX(COALESCE(date, created_at)) AS max_dt")
+                                     .order("max_dt DESC")
+                                     .map { |record| [ Date.strptime(record.ym, "%Y-%m").strftime("%B %Y"), record.ym ] }
+
+    @year_options = workshop_logs.pluck(
+      Arel.sql("DISTINCT EXTRACT(YEAR FROM COALESCE(date, created_at, NOW()))")
+    ).sort.reverse
+    @organizations = Organization.where(id: @organization.id)
+    @per_page = params[:per_page] || 10
+    @workshop_logs_unpaginated = workshop_logs
+    @workshop_logs_count = @workshop_logs_unpaginated.size
+    @workshop_logs = @workshop_logs_unpaginated.paginate(page: params[:page], per_page: @per_page)
+    @facilitators = User.active.or(User.where(id: @workshop_logs_unpaginated.pluck(:user_id)))
+                        .joins(:workshop_logs)
+                        .distinct
+                        .order(:last_name, :first_name)
+  end
+
+  def new
+    @organization = Organization.new
+    set_form_variables
+  end
+
+  def edit
+    set_form_variables
+  end
+
+  def create
+    @organization = Organization.new(organization_params)
+
+    if @organization.save
+      redirect_to organizations_path, notice: "Organization was successfully created."
+    else
+      set_form_variables
+      render :new, status: :unprocessable_content
+    end
+  end
+
+  def update
+    if @organization.update(organization_params)
+      redirect_to organizations_path, notice: "Organization was successfully updated.", status: :see_other
+    else
+      set_form_variables
+      render :edit, status: :unprocessable_content
+    end
+  end
+
+  def destroy
+    @organization.destroy!
+    redirect_to organizations_path, notice: "Organization was successfully destroyed."
+  end
+
+  # Optional hooks for setting variables for forms or index
+  def set_form_variables
+    @organization_statuses = OrganizationStatus.all
+    @facilitators_array = Facilitator.joins(:user)
+                                     .order(:first_name, :last_name)
+                                     .map { |f| [ f.name, f.user.id ] }
+    @organization.organization_users = @organization.organization_users
+                                     .includes(:organization)
+                                     .sort_by { |ou| ou.user.facilitator&.name.to_s.downcase }
+  end
+
+  def set_index_variables
+    @organization_statuses = OrganizationStatus.all
+  end
+
+  private
+
+  def set_organization
+    @organization = Organization.find(params[:id])
+  end
+
+  # Strong parameters
+  def organization_params
+    params.require(:organization).permit(
+      :name, :description, :start_date, :end_date, :mission_vision_values, :internal_id,
+      :inactive, :logo, :notes, :agency_type,  :agency_type_other, :website_url,
+      :organization_status_id, :location_id, :windows_type_id,
+      sectorable_items_attributes: [
+        :id,
+        :sector_id,
+        :_destroy
+      ],
+      organization_users_attributes: [
+        :id,
+        :user_id,
+        :inactive,
+        :title,
+        :_destroy
+      ],
+      addresses_attributes: [
+        :id,
+        :address_type,
+        :inactive,
+        :phone,
+        :street_address,
+        :city,
+        :state,
+        :zip_code,
+        :county,
+        :country,
+        :district,
+        :locality,
+        :la_city_council_district,
+        :la_supervisorial_district,
+        :la_service_planning_area,
+        :_destroy
+      ]
+    )
+  end
+end
diff --git a/app/decorators/organization_decorator.rb b/app/decorators/organization_decorator.rb
new file mode 100644
index 000000000..7f8a76095
--- /dev/null
+++ b/app/decorators/organization_decorator.rb
@@ -0,0 +1,29 @@
+class OrganizationDecorator < ApplicationDecorator
+  def detail(length: nil)
+    length ? description&.truncate(length) : description
+  end
+
+  def default_display_image
+    return logo if respond_to?(:logo) && logo&.attached?
+    "theme_default.png"
+  end
+
+  def title
+    name
+  end
+
+  def badges
+    years = start_date ? (Time.zone.now.year - start_date.year) : 0
+    badges = []
+    badges << [ "Legacy Organization (10+ years)", "yellow" ] if true || years >= 10
+    badges << [ "Seasoned Organization (3-10 years)", "gray" ] if true || start_date.present? && years >= 3
+    badges << [ "New Organization (<3 years)", "green" ] if true || start_date.present? && years < 3
+    badges << [ "Spotlighted Organization", "gray" ] if true || stories_as_spotlighted_facilitator
+    badges << [ "Events Hosted", "blue" ] if true || Event.count > 3
+    # badges << ["Workshop Author", "gray"] if true || user.workshops.any? # indigo
+    # badges << ["Story Author", "gray"] if true || user.stories_as_creator.any? # pink
+    # badges << ["Sector Leader", "purple"] if true || sectorable_items.where(is_leader: true).any?
+    badges << [ "Blog Contributor", "gray" ] if true # || user.respond_to?(:blogs) && user.blogs.any? # red
+    badges
+  end
+end
diff --git a/app/decorators/organization_status_decorator.rb b/app/decorators/organization_status_decorator.rb
new file mode 100644
index 000000000..5c8d0ac80
--- /dev/null
+++ b/app/decorators/organization_status_decorator.rb
@@ -0,0 +1,3 @@
+class OrganizationStatusDecorator < Draper::Decorator
+  delegate_all
+end
diff --git a/app/decorators/organization_user_decorator.rb b/app/decorators/organization_user_decorator.rb
new file mode 100644
index 000000000..ff7bd9386
--- /dev/null
+++ b/app/decorators/organization_user_decorator.rb
@@ -0,0 +1,5 @@
+class OrganizationUserDecorator < ApplicationDecorator
+  def detail(length: nil)
+    "#{user.full_name}: #{title.presence || position} - #{organization.name}"
+  end
+end
diff --git a/app/models/community_news.rb b/app/models/community_news.rb
index d64f35c83..c4a322d60 100644
--- a/app/models/community_news.rb
+++ b/app/models/community_news.rb
@@ -1,7 +1,7 @@
 class CommunityNews < ApplicationRecord
   include TagFilterable, Trendable, ViewCountable, WindowsTypeFilterable
 
-  belongs_to :project, optional: true
+  belongs_to :organization, optional: true
   belongs_to :windows_type, optional: true
   belongs_to :author, class_name: "User", optional: true
   belongs_to :created_by, class_name: "User"
diff --git a/app/models/organization.rb b/app/models/organization.rb
new file mode 100644
index 000000000..03ffdf416
--- /dev/null
+++ b/app/models/organization.rb
@@ -0,0 +1,107 @@
+class Organization < ApplicationRecord
+  include TagFilterable, Trendable, ViewCountable, WindowsTypeFilterable
+
+  belongs_to :organization_status
+  belongs_to :organization_obligation, optional: true
+  belongs_to :location, optional: true # TODO - remove Location if unused
+  belongs_to :windows_type, optional: true
+  has_many :addresses, as: :addressable, dependent: :destroy
+  has_many :bookmarks, as: :bookmarkable, dependent: :destroy
+  has_many :organization_users, dependent: :restrict_with_error
+  has_many :users, through: :organization_users
+  has_many :reports, through: :users
+  has_many :workshop_logs, through: :users
+
+  has_many :categorizable_items, dependent: :destroy, inverse_of: :categorizable, as: :categorizable
+  has_many :sectorable_items, as: :sectorable, dependent: :destroy
+  # has_many through
+  has_many :categories, through: :categorizable_items
+  has_many :sectors, through: :sectorable_items
+
+  # Asset associations
+  has_one_attached :logo
+
+  # Validations
+  validates :logo,
+            content_type: %w[image/png image/jpeg image/webp],
+            size: { less_than: 5.megabytes }
+  validates :name, presence: true
+  validates :organization_status_id, presence: true
+
+  # Nested attributes
+  accepts_nested_attributes_for :addresses, allow_destroy: true, reject_if: :all_blank
+  accepts_nested_attributes_for :sectorable_items, allow_destroy: true, reject_if: :all_blank
+  accepts_nested_attributes_for :organization_users, allow_destroy: true, reject_if: :all_blank
+
+  # SearchCop
+  include SearchCop
+  search_scope :search do
+    attributes :name
+  end
+
+  scope :address, ->(address) do
+    return all if address.blank?
+    exact = address.to_s
+    wildcard = "%#{exact}%"
+    left_joins(:addresses).where(
+      <<~SQL,
+      addresses.street_address LIKE :wildcard OR
+      addresses.city LIKE :wildcard OR
+      addresses.state LIKE :wildcard OR
+      addresses.county LIKE :wildcard OR
+      addresses.country LIKE :wildcard OR
+      addresses.district LIKE :wildcard OR
+      addresses.locality LIKE :wildcard OR
+      addresses.zip_code LIKE :exact OR
+      CAST(addresses.la_city_council_district AS CHAR) = :exact OR
+      CAST(addresses.la_service_planning_area AS CHAR) = :exact OR
+      CAST(addresses.la_supervisorial_district AS CHAR) = :exact
+    SQL
+      wildcard: wildcard, exact: exact)
+  end
+  scope :active, ->(active = nil) { active ? where(inactive: !active) : where(inactive: false) }
+  scope :by_most_viewed, ->(limit = 10) { order(view_count: :desc).limit(limit) }
+  scope :organization_ids, ->(organization_ids) { where(id: organization_ids.to_s.split("-").map(&:to_i)) }
+  scope :published, ->(published = nil) { published ? active(published) : active }
+  scope :category_names, ->(names) { tag_names(:categories, names) }
+  scope :sector_names,   ->(names) { tag_names(:sectors, names) }
+
+  def self.search_by_params(params)
+    organizations = self.all
+    organizations = organizations.search(params[:query]) if params[:query].present?
+    organizations = organizations.sector_names(params[:sector_names]) if params[:sector_names].present?
+    organizations = organizations.category_names(params[:category_names]) if params[:category_names].present?
+    organizations = organizations.address(params[:address]) if params[:address].present?
+    organizations = organizations.windows_type_name(params[:windows_type_name]) if params[:windows_type_name].present?
+    organizations = organizations.organization_ids(params[:organization_ids]) if params[:organization_ids].present?
+    organizations
+  end
+
+  # Methods
+  def led_by?(user)
+    return false unless leader
+    leader.user == user
+  end
+
+  def type_name
+    "#{name} #{ " (#{windows_type.short_name})" if windows_type}"
+  end
+
+  def organization_description
+    "#{name}, #{organization_locality}"
+  end
+
+  def organization_locality
+    addresses.active.first&.locality
+  end
+
+  def sector_list
+    sectors.pluck(:name)
+  end
+
+  private
+
+  def leader
+    organization_users.find_by(position: 2)
+  end
+end
diff --git a/app/models/organization_obligation.rb b/app/models/organization_obligation.rb
new file mode 100644
index 000000000..2203d1df7
--- /dev/null
+++ b/app/models/organization_obligation.rb
@@ -0,0 +1,5 @@
+class OrganizationObligation < ApplicationRecord
+  OBLIGATION_TYPES = [ "Current Grant Funded", "Previous Grant Funded",
+                      "Voluntary Reporting", "Intermittent Reporting",
+                      "Active Non-Reporting" ]
+end
diff --git a/app/models/organization_status.rb b/app/models/organization_status.rb
new file mode 100644
index 000000000..fde753171
--- /dev/null
+++ b/app/models/organization_status.rb
@@ -0,0 +1,7 @@
+class OrganizationStatus < ApplicationRecord
+  ORGANIZATION_STATUSES = [ "Active", "Inactive", "Pending", "Reinstate", "Suspended", "Unknown" ]
+
+  has_many :organizations
+
+  validates :name, presence: true, uniqueness: true
+end
diff --git a/app/models/organization_user.rb b/app/models/organization_user.rb
new file mode 100644
index 000000000..e41e72dee
--- /dev/null
+++ b/app/models/organization_user.rb
@@ -0,0 +1,17 @@
+class OrganizationUser < ApplicationRecord
+  belongs_to :organization
+  belongs_to :user
+
+  # Validations
+  validates_presence_of :organization_id
+
+  # Enum
+  enum :position, { default: 0, liaison: 1, leader: 2, assistant: 3 }
+
+  scope :active, -> { where(inactive: false) }
+
+  # Methods
+  def name
+    "#{user.name}" if user
+  end
+end
diff --git a/app/models/report.rb b/app/models/report.rb
index a569d5851..3a9c5bf85 100644
--- a/app/models/report.rb
+++ b/app/models/report.rb
@@ -1,7 +1,7 @@
 class Report < ApplicationRecord
   belongs_to :owner, polymorphic: true, optional: true
   belongs_to :user
-  belongs_to :project
+  belongs_to :organization
   belongs_to :windows_type
   has_one :form, as: :owner
   has_many :bookmarks, as: :bookmarkable, dependent: :destroy
diff --git a/app/models/story.rb b/app/models/story.rb
index c7078f1ca..f0b34cb65 100644
--- a/app/models/story.rb
+++ b/app/models/story.rb
@@ -4,7 +4,7 @@ class Story < ApplicationRecord
   belongs_to :created_by, class_name: "User"
   belongs_to :updated_by, class_name: "User"
   belongs_to :windows_type
-  belongs_to :project, optional: true
+  belongs_to :organization, optional: true
   belongs_to :spotlighted_facilitator, class_name: "Facilitator",
              foreign_key: "spotlighted_facilitator_id", optional: true
   belongs_to :story_idea, optional: true
diff --git a/app/models/story_idea.rb b/app/models/story_idea.rb
index 757b79390..fe37ea1d5 100644
--- a/app/models/story_idea.rb
+++ b/app/models/story_idea.rb
@@ -7,7 +7,7 @@ class StoryIdea < ApplicationRecord
 
   belongs_to :created_by, class_name: "User"
   belongs_to :updated_by, class_name: "User"
-  belongs_to :project
+  belongs_to :organization
   belongs_to :windows_type
   belongs_to :workshop, optional: true
   has_many :bookmarks, as: :bookmarkable, dependent: :destroy
@@ -23,7 +23,7 @@ class StoryIdea < ApplicationRecord
   # Validations
   validates :created_by_id, presence: true
   validates :updated_by_id, presence: true
-  validates :project_id, presence: true
+  validates :organization_id, presence: true
   validates :windows_type_id, presence: true
   validates :body, presence: true
   validates :permission_given, presence: true
@@ -57,14 +57,14 @@ def author_credit
   end
 
   def organization_name
-    project.name
+    organization.name
   end
 
   def organization_locality
-    project&.organization_locality
+    organization&.organization_locality
   end
 
   def organization_description
-    project&.organization_description
+    organization&.organization_description
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 88526c7da..2ea550354 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -12,7 +12,7 @@ class User < ApplicationRecord
   has_many :bookmarks, dependent: :destroy
   has_many :event_registrations, foreign_key: :registrant_id, dependent: :destroy
   has_many :notifications, as: :noticeable
-  has_many :project_users, dependent: :destroy
+  has_many :organization_users, dependent: :destroy
   has_many :reports
   has_many :resources
   has_many :user_forms, dependent: :destroy
@@ -30,20 +30,20 @@ class User < ApplicationRecord
   has_many :bookmarked_workshops, through: :bookmarks, source: :bookmarkable, source_type: "Workshop"
   has_many :bookmarked_resources, through: :bookmarks, source: :bookmarkable, source_type: "Resource"
   has_many :bookmarked_events, through: :bookmarks, source: :bookmarkable, source_type: "Event"
-  has_many :colleagues, -> { select(:user_id, :position, :project_id).distinct },
-           through: :projects, source: :project_users
-  has_many :communal_reports, through: :projects, source: :reports
+  has_many :colleagues, -> { select(:user_id, :position, :organization_id).distinct },
+           through: :organizations, source: :organization_users
+  has_many :communal_reports, through: :organizations, source: :reports
   has_many :events, through: :event_registrations
-  has_many :projects, through: :project_users
+  has_many :organizations, through: :organization_users
   has_many :user_form_form_fields, through: :user_forms, dependent: :destroy
-  has_many :windows_types, through: :projects
+  has_many :windows_types, through: :organizations
   # Images
   has_one_attached :avatar
 
   # Nested attributes
   accepts_nested_attributes_for :user_forms
-  accepts_nested_attributes_for :project_users, allow_destroy: true,
-    reject_if: proc { |attrs| attrs["project_id"].blank? || attrs["title"].blank? }
+  accepts_nested_attributes_for :organization_users, allow_destroy: true,
+    reject_if: proc { |attrs| attrs["organization_id"].blank? || attrs["title"].blank? }
 
   # Validations
   validates :email, presence: true, uniqueness: { case_sensitive: false }
@@ -52,7 +52,7 @@ class User < ApplicationRecord
   include SearchCop
   search_scope :search do
     attributes [ :email, :first_name, :last_name, :phone ]
-    attributes user: "projects.name"
+    attributes user: "organizations.name"
   end
 
   scope :active, -> { where(inactive: false) }
@@ -65,8 +65,8 @@ def self.search_by_params(params)
     results
   end
 
-  def has_liasion_position_for?(project_id)
-    !project_users.where(project_id: project_id, position: 1).first.nil?
+  def has_liasion_position_for?(organization_id)
+    !organization_users.where(organization_id: organization_id, position: 1).first.nil?
   end
 
   def active_for_authentication?
diff --git a/app/models/workshop_log.rb b/app/models/workshop_log.rb
index 9bab0523a..cb7b80d66 100644
--- a/app/models/workshop_log.rb
+++ b/app/models/workshop_log.rb
@@ -14,7 +14,7 @@ class WorkshopLog < Report
 
   # Scopes
   scope :workshop_id, ->(workshop_id) { where(workshop_id: workshop_id) if workshop_id.present? }
-  scope :project_id, ->(project_id) { where(project_id: project_id) if project_id.present? }
+  scope :organization_id, ->(organization_id) { where(organization_id: organization_id) if organization_id.present? }
   scope :user_id, ->(user_id) { where(user_id: user_id.to_i) if user_id.present? }
   scope :month_and_year, ->(month_and_year) {
     if month_and_year.present?
@@ -34,7 +34,7 @@ def self.search(params)
     logs = logs.month_and_year(params[:month_and_year]) if params[:month_and_year].present?
     logs = logs.year(params[:year]) if params[:year].present?
     logs = logs.workshop_id(params[:workshop_id]) if params[:workshop_id].present?
-    logs = logs.project_id(params[:project_id]) if params[:project_id].present?
+    logs = logs.organization_id(params[:organization_id]) if params[:organization_id].present?
     logs.ordered_by_date
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index a888cd316..47b2e9ed5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -60,9 +60,8 @@
   resources :faqs
   resources :notifications, only: [ :index, :show ]
   resources :organizations
-  resources :projects
-  resources :project_statuses
-  resources :project_users
+  resources :organization_statuses
+  resources :organization_users
   resources :quotes
 
   resources :monthly_reports
diff --git a/db/migrate/20260120004745_rename_projects_to_organizations.rb b/db/migrate/20260120004745_rename_projects_to_organizations.rb
new file mode 100644
index 000000000..c9235f56e
--- /dev/null
+++ b/db/migrate/20260120004745_rename_projects_to_organizations.rb
@@ -0,0 +1,59 @@
+class RenameProjectsToOrganizations < ActiveRecord::Migration[8.1]
+  def change
+    # Rename main projects table to organizations
+    rename_table :projects, :organizations
+
+    # Rename project_statuses table
+    rename_table :project_statuses, :organization_statuses
+
+    # Rename project_obligations table
+    rename_table :project_obligations, :organization_obligations
+
+    # Rename project_users table
+    rename_table :project_users, :organization_users
+
+    # Update foreign key columns
+    rename_column :organization_users, :project_id, :organization_id
+    rename_column :organization_users, :agency_id, :organization_agency_id
+
+    # Update foreign key in organizations table
+    rename_column :organizations, :project_status_id, :organization_status_id
+
+    # Update project_id foreign keys in other tables
+    rename_column :community_news, :project_id, :organization_id
+    rename_column :monthly_reports, :project_id, :organization_id
+    rename_column :reports, :project_id, :organization_id
+    rename_column :stories, :project_id, :organization_id
+    rename_column :story_ideas, :project_id, :organization_id
+    rename_column :workshop_logs, :project_id, :organization_id
+
+    # Rename project_user_id foreign key
+    rename_column :monthly_reports, :project_user_id, :organization_user_id
+
+    # Rename indexes
+    rename_index :organization_users, 'index_project_users_on_project_id', 'index_organization_users_on_organization_id'
+    rename_index :organization_users, 'index_project_users_on_agency_id', 'index_organization_users_on_organization_agency_id'
+    rename_index :organization_users, 'index_project_users_on_user_id', 'index_organization_users_on_user_id'
+
+    rename_index :organizations, 'index_projects_on_location_id', 'index_organizations_on_location_id'
+    rename_index :organizations, 'index_projects_on_project_status_id', 'index_organizations_on_organization_status_id'
+    rename_index :organizations, 'index_projects_on_view_count', 'index_organizations_on_view_count'
+    rename_index :organizations, 'index_projects_on_windows_type_id', 'index_organizations_on_windows_type_id'
+
+    rename_index :community_news, 'index_community_news_on_project_id', 'index_community_news_on_organization_id'
+    rename_index :monthly_reports, 'index_monthly_reports_on_project_id', 'index_monthly_reports_on_organization_id'
+    rename_index :monthly_reports, 'index_monthly_reports_on_project_user_id', 'index_monthly_reports_on_organization_user_id'
+    rename_index :reports, 'index_reports_on_project_id', 'index_reports_on_organization_id'
+    rename_index :stories, 'index_stories_on_project_id', 'index_stories_on_organization_id'
+    rename_index :story_ideas, 'index_story_ideas_on_project_id', 'index_story_ideas_on_organization_id'
+    rename_index :workshop_logs, 'index_workshop_logs_on_project_id', 'index_workshop_logs_on_organization_id'
+
+    # Rename foreign key constraints
+    # Note: Rails will handle updating foreign key references automatically when we rename the columns
+    # However, we need to explicitly update any named foreign key constraints
+
+    # For users table that references projects as agency_id
+    # The existing foreign key is already named correctly as it references projects.id
+    # Rails will automatically update this when we rename the table
+  end
+end

From 6dc0b8be1f92c0a2ef243fddee9108d866991f8e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 20 Jan 2026 01:03:52 +0000
Subject: [PATCH 3/5] Update view files and controllers for Organization

Co-authored-by: maebeale <7607813+maebeale@users.noreply.github.com>
---
 app/controllers/facilitators_controller.rb    | 14 ++--
 app/controllers/users_controller.rb           | 12 ++--
 app/views/facilitators/_form.html.erb         | 20 +++---
 ...erb => _organization_user_fields.html.erb} |  8 +--
 .../_form.html.erb                            | 12 ++--
 .../edit.html.erb                             |  6 +-
 .../index.html.erb                            | 26 +++----
 .../new.html.erb                              |  4 +-
 .../show.html.erb                             | 22 +++---
 .../_address_fields.html.erb                  |  0
 .../_form.html.erb                            | 42 +++++------
 .../_organization_user_fields.html.erb}       |  2 +-
 .../_search_boxes.html.erb                    | 10 +--
 .../_sectorable_item_fields.html.erb          |  0
 .../_social_media_buttons.html.erb            | 22 +++---
 .../{projects => organizations}/edit.html.erb |  4 +-
 .../index.html.erb                            | 42 +++++------
 .../{projects => organizations}/new.html.erb  |  2 +-
 .../{projects => organizations}/show.html.erb | 72 +++++++++----------
 ...r.html.erb => _organization_user.html.erb} |  4 +-
 ...erb => _organization_user_fields.html.erb} |  6 +-
 21 files changed, 165 insertions(+), 165 deletions(-)
 rename app/views/facilitators/{_project_user_fields.html.erb => _organization_user_fields.html.erb} (85%)
 rename app/views/{project_statuses => organization_statuses}/_form.html.erb (60%)
 rename app/views/{project_statuses => organization_statuses}/edit.html.erb (75%)
 rename app/views/{project_statuses => organization_statuses}/index.html.erb (66%)
 rename app/views/{project_statuses => organization_statuses}/new.html.erb (82%)
 rename app/views/{project_statuses => organization_statuses}/show.html.erb (66%)
 rename app/views/{projects => organizations}/_address_fields.html.erb (100%)
 rename app/views/{projects => organizations}/_form.html.erb (88%)
 rename app/views/{projects/_project_user_fields.html.erb => organizations/_organization_user_fields.html.erb} (94%)
 rename app/views/{projects => organizations}/_search_boxes.html.erb (85%)
 rename app/views/{projects => organizations}/_sectorable_item_fields.html.erb (100%)
 rename app/views/{projects => organizations}/_social_media_buttons.html.erb (72%)
 rename app/views/{projects => organizations}/edit.html.erb (84%)
 rename app/views/{projects => organizations}/index.html.erb (73%)
 rename app/views/{projects => organizations}/new.html.erb (91%)
 rename app/views/{projects => organizations}/show.html.erb (72%)
 rename app/views/shared/{_project_user.html.erb => _organization_user.html.erb} (87%)
 rename app/views/users/{_project_user_fields.html.erb => _organization_user_fields.html.erb} (91%)

diff --git a/app/controllers/facilitators_controller.rb b/app/controllers/facilitators_controller.rb
index ad1a27044..60380aaf0 100644
--- a/app/controllers/facilitators_controller.rb
+++ b/app/controllers/facilitators_controller.rb
@@ -81,14 +81,14 @@ def set_form_variables
     # @facilitator.build_user if @facilitator.user.blank? # Build a fresh one if missing
 
     if @facilitator.user
-      @facilitator.user.project_users.first || @facilitator.user.project_users.build
+      @facilitator.user.organization_users.first || @facilitator.user.organization_users.build
     end
-    projects = if current_user.super_user?
-      Project.active
+    organizations = if current_user.super_user?
+      Organization.active
     else
-      current_user.projects
+      current_user.organizations
     end
-    @projects_array = projects.order(:name).pluck(:name, :id)
+    @organizations_array = organizations.order(:name).pluck(:name, :id)
   end
 
 
@@ -176,9 +176,9 @@ def facilitator_params
         :state2,
         :zip2,
         :notes,
-        project_users_attributes: [
+        organization_users_attributes: [
           :id,
-          :project_id,
+          :organization_id,
           :position,
           :title,
           :inactive,
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 78102f9c9..43cf7c514 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -110,13 +110,13 @@ def set_facilitator
 
   def set_form_variables
     set_facilitator
-    @user.project_users.first || @user.project_users.build
-    projects = if current_user.super_user?
-      Project.active
+    @user.organization_users.first || @user.organization_users.build
+    organizations = if current_user.super_user?
+      Organization.active
     else
-      current_user.projects
+      current_user.organizations
     end
-    @projects_array = projects.order(:name).pluck(:name, :id)
+    @organizations_array = organizations.order(:name).pluck(:name, :id)
   end
 
   def password_param
@@ -135,7 +135,7 @@ def user_params
       :notes, :primary_address, :avatar, :subscribecode,
       :agency_id, :facilitator_id, :created_by_id, :updated_by_id,
       :confirmed, :inactive, :super_user, :legacy, :legacy_id,
-      project_users_attributes: [ :id, :project_id, :position, :title, :inactive, :_destroy ]
+      organization_users_attributes: [ :id, :organization_id, :position, :title, :inactive, :_destroy ]
     )
   end
 end
diff --git a/app/views/facilitators/_form.html.erb b/app/views/facilitators/_form.html.erb
index 67f09cadb..0bd19227f 100644
--- a/app/views/facilitators/_form.html.erb
+++ b/app/views/facilitators/_form.html.erb
@@ -149,27 +149,27 @@
       <div class="rounded-lg border border-gray-200 bg-gray-50 p-4 mb-4 shadow-sm">
         <% if current_user.super_user? %>
           <div class="admin-only bg-blue-100 p-3">
-            <%= u.fields_for :project_users do |project_user_form| %>
-              <%= render "project_user_fields",
-                         f: project_user_form,
-                         projects: u.object.projects,
+            <%= u.fields_for :organization_users do |organization_user_form| %>
+              <%= render "organization_user_fields",
+                         f: organization_user_form,
+                         organizations: u.object.organizations,
                          user: u.object %>
             <% end %>
 
             <div class="admin-only bg-blue-100 p-3 mt-6">
               <%= link_to_add_association "➕ Add Role",
                                           u,
-                                          :project_users,
-                                          html_options: { locals: { projects: u.object.projects } },
+                                          :organization_users,
+                                          html_options: { locals: { organizations: u.object.organizations } },
                                           class: "btn btn-secondary-outline" %>
             </div>
           </div>
         <% else %>
-          <% f.object.user && f.object.user.project_users.each do |pu| %>
+          <% f.object.user && f.object.user.organization_users.each do |ou| %>
             <div class="ps-6 mb-2">
-              <li><%= pu.title || pu.position %> - <%= pu.persisted? ? (link_to pu.project&.name,
-                                                               project_path(pu.project),
-                                                               class: "underline") : pu.project&.name %></li>
+              <li><%= ou.title || ou.position %> - <%= ou.persisted? ? (link_to ou.organization&.name,
+                                                               organization_path(ou.organization),
+                                                               class: "underline") : ou.organization&.name %></li>
             </div>
           <% end %>
         <% end %>
diff --git a/app/views/facilitators/_project_user_fields.html.erb b/app/views/facilitators/_organization_user_fields.html.erb
similarity index 85%
rename from app/views/facilitators/_project_user_fields.html.erb
rename to app/views/facilitators/_organization_user_fields.html.erb
index f9b50287d..070276b43 100644
--- a/app/views/facilitators/_project_user_fields.html.erb
+++ b/app/views/facilitators/_organization_user_fields.html.erb
@@ -2,11 +2,11 @@
   <div class="grid grid-cols-1 md:grid-cols-4 gap-4 items-start mb-4">
 
     <div>
-      <%= f.input :project_id,
+      <%= f.input :organization_id,
                   as: :select,
                   label: "Organization",
-                  collection: @projects_array,
-                  selected: f.object.project_id,
+                  collection: @organizations_array,
+                  selected: f.object.organization_id,
                   input_html: {
                     class: "block w-full rounded-md border-gray-300 focus:ring-blue-500 focus:border-blue-500"
                   } %>
@@ -38,6 +38,6 @@
   </div>
 <% else %>
   <div class="ps-6 mb-4">
-    <li><%= f.object.project&.name %> (<%= f.object.title || f.object.position %>)</li>
+    <li><%= f.object.organization&.name %> (<%= f.object.title || f.object.position %>)</li>
   </div>
 <% end %>
diff --git a/app/views/project_statuses/_form.html.erb b/app/views/organization_statuses/_form.html.erb
similarity index 60%
rename from app/views/project_statuses/_form.html.erb
rename to app/views/organization_statuses/_form.html.erb
index a69ea4067..22afb4ff3 100644
--- a/app/views/project_statuses/_form.html.erb
+++ b/app/views/organization_statuses/_form.html.erb
@@ -1,12 +1,12 @@
-<%= simple_form_for(@project_status) do |f| %>
+<%= simple_form_for(@organization_status) do |f| %>
   <div class="form-body space-y-6">
     <!-- Form Errors -->
     <%= f.error_notification %>
-    <%= render "shared/errors", resource: @project_status if @project_status.errors.any? %>
+    <%= render "shared/errors", resource: @organization_status if @organization_status.errors.any? %>
 
     <!-- Form Fields -->
     <div class="row">
-      <% @project_status.attribute_names.reject { |a| ["id", "created_at", "updated_at"].include?(a) }.each do |attr| %>
+      <% @organization_status.attribute_names.reject { |a| ["id", "created_at", "updated_at"].include?(a) }.each do |attr| %>
         <% next if ["id", "created_at", "updated_at"].include?(attr) %>
         <div class="col-md-6 mb-3">
           <%= f.input attr.to_sym, input_html: { class: "form-control" } %>
@@ -16,11 +16,11 @@
 
     <!-- Form Actions -->
     <div class="form-actions flex flex-wrap gap-3 mt-6 justify-end">
-      <% if @project_status.persisted? && current_user.super_user? %>
-        <%= link_to "Delete", @project_status, method: :delete,
+      <% if @organization_status.persisted? && current_user.super_user? %>
+        <%= link_to "Delete", @organization_status, method: :delete,
                             class: "btn btn-danger-outline", data: { confirm: "Are you sure?" } %>
       <% end %>
-      <%= link_to "Cancel", project_statuses_path, class: "btn btn-secondary-outline" %>
+      <%= link_to "Cancel", organization_statuses_path, class: "btn btn-secondary-outline" %>
       <%= f.button :submit,
                   class: "bg-blue-600 text-white px-6 py-2 rounded-lg hover:bg-blue-700
                           transition-colors duration-150" %>
diff --git a/app/views/project_statuses/edit.html.erb b/app/views/organization_statuses/edit.html.erb
similarity index 75%
rename from app/views/project_statuses/edit.html.erb
rename to app/views/organization_statuses/edit.html.erb
index a04763e32..afc354d0d 100644
--- a/app/views/project_statuses/edit.html.erb
+++ b/app/views/organization_statuses/edit.html.erb
@@ -2,14 +2,14 @@
   <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
     <div class="max-w-5xl mx-auto bg-white border border-gray-200 rounded-xl shadow-lg hover:shadow-xl transition-shadow duration-200 p-6">
       <div class="flex items-center justify-between mb-6">
-        <h1 class="text-2xl font-semibold text-gray-900">Edit <%= @project_status.class.model_name.human %></h1>
-        <%= link_to "View", project_status_path(@project_status),
+        <h1 class="text-2xl font-semibold text-gray-900">Edit <%= @organization_status.class.model_name.human %></h1>
+        <%= link_to "View", organization_status_path(@organization_status),
                             class: "btn btn-secondary-outline" %>
       </div>
 
       <div class="space-y-6">
         <div class="mt-4">
-          <%= render "form", project_status: @project_status %>
+          <%= render "form" %>
         </div>
       </div>
     </div>
diff --git a/app/views/project_statuses/index.html.erb b/app/views/organization_statuses/index.html.erb
similarity index 66%
rename from app/views/project_statuses/index.html.erb
rename to app/views/organization_statuses/index.html.erb
index f989610e5..60523fce1 100644
--- a/app/views/project_statuses/index.html.erb
+++ b/app/views/organization_statuses/index.html.erb
@@ -1,17 +1,17 @@
 <div class="min-h-screen py-8">
   <div class="max-w-full mx-auto px-4 sm:px-6 lg:px-8">
     <div class="admin-only bg-blue-100 rounded p-6">
-      <div class="max-w-7xl mx-auto <%= DomainTheme.bg_class_for(:project_statuses, intensity: 100) %>
+      <div class="max-w-7xl mx-auto <%= DomainTheme.bg_class_for(:organization_statuses, intensity: 100) %>
         border border-gray-200 rounded-xl shadow-lg hover:shadow-xl transition-shadow duration-200 p-6">
       <div class="space-y-6">
         <!-- Header -->
         <div class="flex items-center justify-between mb-6">
           <h1 class="text-2xl font-semibold text-gray-900">
-            <%= ProjectStatus.model_name.human.pluralize %> (<%= @count_display %>)
+            <%= OrganizationStatus.model_name.human.pluralize %> (<%= @count_display %>)
           </h1>
           <div class="flex gap-2">
-            <%= link_to("New #{ ProjectStatus.model_name.human.downcase }",
-                        new_project_status_path,
+            <%= link_to("New #{ OrganizationStatus.model_name.human.downcase }",
+                        new_organization_status_path,
                         class: "btn btn-primary-outline") %>
           </div>
         </div>
@@ -27,24 +27,24 @@
             </thead>
 
             <tbody class="divide-y divide-gray-200">
-              <% @project_statuses.each do |project_status| %>
+              <% @organization_statuses.each do |organization_status| %>
               <tr>
 
                 <td class="px-4 py-2 text-gray-700">
-                  <%= project_status.name %>
+                  <%= organization_status.name %>
                 </td>
 
                 <td class="px-4 py-2 text-gray-700">
-                  <%= link_to project_status.projects.count,
-                              projects_path(project_status_id: project_status.id,
-                                            project_ids: project_status.projects.pluck(:id).join("-")),
+                  <%= link_to organization_status.organizations.count,
+                              organizations_path(organization_status_id: organization_status.id,
+                                            organization_ids: organization_status.organizations.pluck(:id).join("-")),
                               class: "btn btn-secondary-default" %>
                 </td>
 
                 <td class="px-4 py-2">
                   <div class="flex items-center gap-3">
                     <%= link_to "Edit",
-                                edit_project_status_path(project_status),
+                                edit_organization_status_path(organization_status),
                                 class: "btn btn-secondary-outline" %>
                   </div>
                 </td>
@@ -55,15 +55,15 @@
         </div>
 
         <!-- Empty state -->
-        <% unless @project_statuses.any? %>
+        <% unless @organization_statuses.any? %>
           <p class="text-gray-500 text-center py-6">
-            No <%= ProjectStatus.model_name.human.pluralize.downcase %> found.
+            No <%= OrganizationStatus.model_name.human.pluralize.downcase %> found.
           </p>
         <% end %>
 
         <!-- Pagination -->
         <div class="pagination flex justify-center mt-12">
-          <%= tailwind_paginate @project_statuses %>
+          <%= tailwind_paginate @organization_statuses %>
         </div>
       </div>
     </div>
diff --git a/app/views/project_statuses/new.html.erb b/app/views/organization_statuses/new.html.erb
similarity index 82%
rename from app/views/project_statuses/new.html.erb
rename to app/views/organization_statuses/new.html.erb
index c90d575ec..8d68d638f 100644
--- a/app/views/project_statuses/new.html.erb
+++ b/app/views/organization_statuses/new.html.erb
@@ -2,14 +2,14 @@
   <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
     <div class="max-w-5xl mx-auto bg-white border border-gray-200 rounded-xl shadow-lg hover:shadow-xl transition-shadow duration-200 p-6">
       <div class="flex items-center justify-between mb-3">
-        <h1 class="text-2xl font-semibold text-gray-900">New <%= @project_status.class.model_name.human %></h1>
+        <h1 class="text-2xl font-semibold text-gray-900">New <%= @organization_status.class.model_name.human %></h1>
       </div>
 
       <div class="border-b border-gray-300 mb-6"></div>
 
       <div class="space-y-6">
         <div class="mt-4">
-          <%= render "form", project_status: @project_status %>
+          <%= render "form" %>
         </div>
       </div>
     </div>
diff --git a/app/views/project_statuses/show.html.erb b/app/views/organization_statuses/show.html.erb
similarity index 66%
rename from app/views/project_statuses/show.html.erb
rename to app/views/organization_statuses/show.html.erb
index c3300f580..4eb1cdf39 100644
--- a/app/views/project_statuses/show.html.erb
+++ b/app/views/organization_statuses/show.html.erb
@@ -4,14 +4,14 @@
       <div class="flex items-center justify-between mb-6">
         <!-- Title -->
         <h1 class="text-2xl font-semibold text-gray-900">
-          <%= @project_status.class.model_name.human %> Details
+          <%= @organization_status.class.model_name.human %> Details
         </h1>
 
         <!-- Buttons Group -->
         <div class="flex items-center gap-2">
-          <%= link_to("Index", project_statuses_path, class: "btn btn-secondary-outline") %>
+          <%= link_to("Index", organization_statuses_path, class: "btn btn-secondary-outline") %>
           <% if current_user.super_user? %>
-            <%= link_to("Edit", edit_project_status_path(@project_status), class: "btn btn-primary-outline") %>
+            <%= link_to("Edit", edit_organization_status_path(@organization_status), class: "btn btn-primary-outline") %>
           <% end %>
         </div>
       </div>
@@ -21,37 +21,37 @@
           <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-3">
               <div class="mb-3">
                 <p class="font-bold text-gray-700">Name:</p>
-                <p class="text-gray-900"><%= @project_status.name %></p>
+                <p class="text-gray-900"><%= @organization_status.name %></p>
               </div>
             
           </div>
         </div>
       </div>
 
-      <!-- Associated Projects -->
+      <!-- Associated Organizations -->
       <div class="pt-6 border-t border-gray-200">
         <h2 class="text-lg font-semibold text-gray-900 mb-3">
-          Associated Projects
+          Associated Organizations
         </h2>
 
-        <% if @project_status.projects.any? %>
+        <% if @organization_status.organizations.any? %>
           <ul class="space-y-2">
-            <% @project_status.projects.order(:name).each do |project| %>
+            <% @organization_status.organizations.order(:name).each do |organization| %>
               <li class="flex items-center justify-between bg-gray-50
                    border border-gray-200 rounded-md px-4 py-2">
           <span class="text-gray-900 font-medium">
-            <%= project.name %>
+            <%= organization.name %>
           </span>
 
                 <%= link_to "View",
-                            project_path(project),
+                            organization_path(organization),
                             class: "text-sm text-indigo-600 hover:underline" %>
               </li>
             <% end %>
           </ul>
         <% else %>
           <p class="text-sm text-gray-500 italic">
-            No projects are currently associated with this status.
+            No organizations are currently associated with this status.
           </p>
         <% end %>
       </div>
diff --git a/app/views/projects/_address_fields.html.erb b/app/views/organizations/_address_fields.html.erb
similarity index 100%
rename from app/views/projects/_address_fields.html.erb
rename to app/views/organizations/_address_fields.html.erb
diff --git a/app/views/projects/_form.html.erb b/app/views/organizations/_form.html.erb
similarity index 88%
rename from app/views/projects/_form.html.erb
rename to app/views/organizations/_form.html.erb
index bd8316059..a895d025e 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/organizations/_form.html.erb
@@ -1,15 +1,15 @@
-<%= simple_form_for(@project) do |f| %>
-  <%= render 'shared/errors', resource: @project if @project.errors.any? %>
+<%= simple_form_for(@organization) do |f| %>
+  <%= render 'shared/errors', resource: @organization if @organization.errors.any? %>
 
   <div class="grid grid-cols-1 md:grid-cols-[3fr_1fr] gap-6 p-3 mb-6 items-start">
 
     <!-- LEFT SIDE (3/4) -->
     <div>
-      <!-- Project Name + Hidden -->
+      <!-- Organization Name + Hidden -->
       <div class="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
         <div class="md:col-span-2">
           <%= f.input :name,
-                      label: "Project Name",
+                      label: "Organization Name",
                       as: :text,
                       required: true,
                       input_html: {
@@ -21,12 +21,12 @@
         </div>
 
         <div class="md:col-span-1">
-          <%= f.input :project_status_id,
-                      label: "Project status",
+          <%= f.input :organization_status_id,
+                      label: "Organization status",
                       as: :select,
                       required: true,
-                      collection: @project_statuses,
-                      selected: f.object.project_status_id,
+                      collection: @organization_statuses,
+                      selected: f.object.organization_status_id,
                       input_html: {
                         class: "w-full rounded-md border-gray-300 shadow-sm
                           focus:ring-blue-500 focus:border-blue-500"
@@ -113,9 +113,9 @@
 
     <% if current_user.super_user? %>
       <div class="admin-only bg-blue-100">
-        <%= f.input :project_status_id,
+        <%= f.input :organization_status_id,
                     as: :select,
-                    collection: @project_statuses,
+                    collection: @organization_statuses,
                     include_blank: true,
                     label: "Status",
                     required: true,
@@ -125,9 +125,9 @@
       </div>
     <% else %>
       <div class="text-md font-semibold">
-        Project status:
+        Organization status:
       </div>
-      <%= f.object.project_status&.name %>
+      <%= f.object.organization_status&.name %>
     <% end %>
   </div>
 
@@ -179,7 +179,7 @@
     <% if current_user.super_user? %>
       <div class="admin-only bg-blue-100">
         <%= f.input :internal_id,
-                    label: "Internal Project ID",
+                    label: "Internal Organization ID",
                     input_html: {
                       class: "rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500"
                     } %>
@@ -247,20 +247,20 @@
     <div class="rounded-lg border border-gray-200 bg-gray-50 p-4 mb-4 shadow-sm">
       <% if current_user.super_user? %>
         <div class="admin-only bg-blue-100 p-3">
-          <%= f.fields_for :project_users do |project_user_form| %>
-            <%= render "project_user_fields",
-                       f: project_user_form %>
+          <%= f.fields_for :organization_users do |organization_user_form| %>
+            <%= render "organization_user_fields",
+                       f: organization_user_form %>
           <% end %>
 
           <div class="admin-only bg-blue-100 p-3 mt-6">
             <%= link_to_add_association "➕ Add Role",
                                         f,
-                                        :project_users,
+                                        :organization_users,
                                         class: "btn btn-secondary-outline" %>
           </div>
         </div>
       <% else %>
-        <% f.object.user && f.object.user.project_users.each do |pu| %>
+        <% f.object.user && f.object.user.organization_users.each do |pu| %>
           <div class="ps-6 mb-2">
             <li><%= pu.title || pu.position %> -
               <%= facilitator_profile_button(pu.user.facilitator) if pu.persisted? && pu.user.facilitator %>
@@ -273,11 +273,11 @@
 
   <!-- ACTIONS -->
   <div class="flex justify-end gap-3">
-    <% if  @project.persisted? && current_user.super_user? %>
-      <%= link_to "Delete", @project, class: "btn btn-danger-outline",
+    <% if  @organization.persisted? && current_user.super_user? %>
+      <%= link_to "Delete", @organization, class: "btn btn-danger-outline",
                   method: :delete, data: { confirm: "Are you sure?" } %>
     <% end %>
-    <%= link_to "Cancel", projects_path, class: "btn btn-utility-outline" %>
+    <%= link_to "Cancel", organizations_path, class: "btn btn-utility-outline" %>
     <%= f.button :submit, class: "btn btn-primary" %>
   </div>
 <% end %>
diff --git a/app/views/projects/_project_user_fields.html.erb b/app/views/organizations/_organization_user_fields.html.erb
similarity index 94%
rename from app/views/projects/_project_user_fields.html.erb
rename to app/views/organizations/_organization_user_fields.html.erb
index 424ed1913..18a19dc9c 100644
--- a/app/views/projects/_project_user_fields.html.erb
+++ b/app/views/organizations/_organization_user_fields.html.erb
@@ -39,6 +39,6 @@
   </div>
 <% else %>
   <div class="ps-6 mb-4">
-    <li><%= f.object.project&.name %> (<%= f.object.title || f.object.position %>)</li>
+    <li><%= f.object.organization&.name %> (<%= f.object.title || f.object.position %>)</li>
   </div>
 <% end %>
diff --git a/app/views/projects/_search_boxes.html.erb b/app/views/organizations/_search_boxes.html.erb
similarity index 85%
rename from app/views/projects/_search_boxes.html.erb
rename to app/views/organizations/_search_boxes.html.erb
index 18f5c2d94..9610ca72c 100644
--- a/app/views/projects/_search_boxes.html.erb
+++ b/app/views/organizations/_search_boxes.html.erb
@@ -1,5 +1,5 @@
 <div class="mb-4">
-  <%= form_with url: projects_path, method: :get, local: true, class: "flex flex-wrap items-end gap-3" do %>
+  <%= form_with url: organizations_path, method: :get, local: true, class: "flex flex-wrap items-end gap-3" do %>
     <div>
       <%= label_tag :query, "Name", class: "text-sm font-medium text-gray-700 mb-1 block" %>
       <%= text_field_tag :query, params[:query],
@@ -28,9 +28,9 @@
     <% if current_user.super_user? %>
       <div class="admin-only bg-blue-100">
         <%= label_tag :status, "Status", class: "text-sm font-medium text-gray-700 mb-1 block" %>
-        <%= select_tag :project_status,
-                       options_for_select(@project_statuses.map { |ps| [ps.name, ps.id] },
-                                          params[:project_status_id].to_s),
+        <%= select_tag :organization_status,
+                       options_for_select(@organization_statuses.map { |ps| [ps.name, ps.id] },
+                                          params[:organization_status_id].to_s),
                        include_blank: "All statuses",
                        class: "w-40 rounded-md border border-gray-300 px-3 py-2 text-gray-800 shadow-sm
                                      focus:border-blue-500 focus:ring focus:ring-blue-200 focus:outline-none",
@@ -38,7 +38,7 @@
       </div>
     <% end %>
 
-    <%= link_to "Clear filters", projects_path,
+    <%= link_to "Clear filters", organizations_path,
                 class: "btn btn-utility-outline w-full sm:w-auto" %>
   <% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/projects/_sectorable_item_fields.html.erb b/app/views/organizations/_sectorable_item_fields.html.erb
similarity index 100%
rename from app/views/projects/_sectorable_item_fields.html.erb
rename to app/views/organizations/_sectorable_item_fields.html.erb
diff --git a/app/views/projects/_social_media_buttons.html.erb b/app/views/organizations/_social_media_buttons.html.erb
similarity index 72%
rename from app/views/projects/_social_media_buttons.html.erb
rename to app/views/organizations/_social_media_buttons.html.erb
index 36fe6a7fb..465319f12 100644
--- a/app/views/projects/_social_media_buttons.html.erb
+++ b/app/views/organizations/_social_media_buttons.html.erb
@@ -1,8 +1,8 @@
-<% return if project.blank? %>
+<% return if organization.blank? %>
 
 <div class="flex flex-wrap items-center gap-1">
-  <% if project.linked_in_url.present? %>
-    <%= link_to project.linked_in_url, target: "_blank", rel: "noopener noreferrer",
+  <% if organization.linked_in_url.present? %>
+    <%= link_to organization.linked_in_url, target: "_blank", rel: "noopener noreferrer",
                 class: "group inline-flex items-center justify-center w-6 h-6
                          rounded-md bg-gray-100 hover:bg-[#0A66C2]
                          transition-colors duration-200" do %>
@@ -10,8 +10,8 @@
     <% end %>
   <% end %>
 
-  <% if project.instagram_url.present? %>
-    <%= link_to project.instagram_url, target: "_blank", rel: "noopener noreferrer",
+  <% if organization.instagram_url.present? %>
+    <%= link_to organization.instagram_url, target: "_blank", rel: "noopener noreferrer",
                 class: "group inline-flex items-center justify-center w-6 h-6
                          rounded-md bg-gray-100 hover:bg-gradient-to-tr
                          hover:from-[#F58529] hover:via-[#DD2A7B] hover:to-[#8134AF]
@@ -20,8 +20,8 @@
     <% end %>
   <% end %>
 
-  <% if project.facebook_url.present? %>
-    <%= link_to project.facebook_url, target: "_blank", rel: "noopener noreferrer",
+  <% if organization.facebook_url.present? %>
+    <%= link_to organization.facebook_url, target: "_blank", rel: "noopener noreferrer",
                 class: "group inline-flex items-center justify-center w-6 h-6
                          rounded-md bg-gray-100 hover:bg-[#1877F2]
                          transition-colors duration-200" do %>
@@ -29,8 +29,8 @@
     <% end %>
   <% end %>
 
-  <% if project.twitter_url.present? %>
-    <%= link_to project.twitter_url, target: "_blank", rel: "noopener noreferrer",
+  <% if organization.twitter_url.present? %>
+    <%= link_to organization.twitter_url, target: "_blank", rel: "noopener noreferrer",
                 class: "group inline-flex items-center justify-center w-6 h-6
                          rounded-md bg-gray-100 hover:bg-[#1DA1F2]
                          transition-colors duration-200" do %>
@@ -38,8 +38,8 @@
     <% end %>
   <% end %>
 
-  <% if project.youtube_url.present? %>
-    <%= link_to project.youtube_url, target: "_blank", rel: "noopener noreferrer",
+  <% if organization.youtube_url.present? %>
+    <%= link_to organization.youtube_url, target: "_blank", rel: "noopener noreferrer",
                 class: "group inline-flex items-center justify-center w-6 h-6
                          rounded-md bg-gray-100 hover:bg-[#FF0000]
                          text-gray-600 hover:text-white
diff --git a/app/views/projects/edit.html.erb b/app/views/organizations/edit.html.erb
similarity index 84%
rename from app/views/projects/edit.html.erb
rename to app/views/organizations/edit.html.erb
index aa1f2637a..20188a4a9 100644
--- a/app/views/projects/edit.html.erb
+++ b/app/views/organizations/edit.html.erb
@@ -3,13 +3,13 @@
     <div class="max-w-5xl mx-auto bg-white border border-gray-200 rounded-xl shadow-lg hover:shadow-xl transition-shadow duration-200 p-6">
       <div class="flex items-center justify-between mb-6">
         <h1 class="text-2xl font-semibold text-gray-900">Edit Organization</h1>
-        <%= link_to 'View', project_path(@project),
+        <%= link_to 'View', organization_path(@organization),
                             class: "btn btn-secondary-outline" %>
       </div>
 
       <div class="space-y-6">
         <div class="mt-4">
-          <%= render "form", project: @project %>
+          <%= render "form" %>
         </div>
       </div>
     </div>
diff --git a/app/views/projects/index.html.erb b/app/views/organizations/index.html.erb
similarity index 73%
rename from app/views/projects/index.html.erb
rename to app/views/organizations/index.html.erb
index b30eb889a..eee6b1a3e 100644
--- a/app/views/projects/index.html.erb
+++ b/app/views/organizations/index.html.erb
@@ -1,14 +1,14 @@
 <div class="min-h-screen py-8">
   <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-    <div class="<%= DomainTheme.bg_class_for(:projects) %> border border-gray-200 rounded-xl shadow-md hover:shadow-lg transition-shadow duration-200 p-6">
+    <div class="<%= DomainTheme.bg_class_for(:organizations) %> border border-gray-200 rounded-xl shadow-md hover:shadow-lg transition-shadow duration-200 p-6">
       <!-- Header -->
       <div class="flex flex-col sm:flex-row justify-between items-center mb-6 gap-3">
         <h1 class="text-2xl font-semibold text-gray-900">
-          Organizations (<%= number_with_delimiter(@projects_count) %>)
+          Organizations (<%= number_with_delimiter(@organizations_count) %>)
         </h1>
         <% if current_user.super_user? %>
           <%= link_to "New Organization",
-                      new_project_path,
+                      new_organization_path,
                       class: "admin-only bg-blue-100 btn btn-primary-outline" %>
         <% end %>
       </div>
@@ -16,7 +16,7 @@
       <!-- Optional filters -->
       <%= render "search_boxes" %>
 
-      <!-- Projects table -->
+      <!-- Organizations table -->
       <div class="rounded-xl bg-white p-6">
         <div class="overflow-x-auto">
         <table class="min-w-full border border-gray-200 rounded-lg divide-y divide-gray-200">
@@ -34,17 +34,17 @@
           </thead>
 
           <tbody class="divide-y divide-gray-100">
-          <% @projects.each do |project| %>
+          <% @organizations.each do |organization| %>
             <tr class="hover:bg-gray-50 transition">
               <td class="px-4 py-2 text-center">
-                <%= link_to project_path(project) do %>
-                  <% if project.logo.attached? %>
+                <%= link_to organization_path(organization) do %>
+                  <% if organization.logo.attached? %>
                     <%= image_tag(
-                          project.logo,
+                          organization.logo,
                           class: "w-10 h-10 rounded-full object-cover border border-gray-300 shadow-sm mx-auto"
                         ) %>
                   <% else %>
-                    <%= link_to project_path(project) do %>
+                    <%= link_to organization_path(organization) do %>
                       <svg class="w-10 h-10 text-gray-400 bg-gray-200 rounded-full"
                            fill="currentColor"
                            viewBox="0 0 20 18"
@@ -55,39 +55,39 @@
               </td>
 
               <td class="px-4 py-2 font-semibold">
-                <%= link_to project.name, project_path(project), class: "hover:underline" %>
+                <%= link_to organization.name, organization_path(organization), class: "hover:underline" %>
               </td>
 
               <td class="px-4 py-2 text-sm text-gray-700">
-                <%= project.windows_type&.short_name&.titleize %>
+                <%= organization.windows_type&.short_name&.titleize %>
               </td>
 
               <td class="px-4 py-2 text-sm text-gray-700">
-                <%= project.addresses.active.map(&:locality).join("<br>") %>
+                <%= organization.addresses.active.map(&:locality).join("<br>") %>
               </td>
 
               <td class="px-4 py-2 text-sm text-gray-700 whitespace-nowrap">
-                <% if project.start_date || project.end_date %>
-                  <%= project.start_date&.strftime("%b %Y") %> –
-                  <%= project.end_date&.strftime("%b %Y") || "Present" %>
+                <% if organization.start_date || organization.end_date %>
+                  <%= organization.start_date&.strftime("%b %Y") %> –
+                  <%= organization.end_date&.strftime("%b %Y") || "Present" %>
                 <% end %>
               </td>
 
               <td class="px-4 py-2 text-sm">
                   <span class="inline-block px-2 py-1 rounded text-xs font-semibold
-                                <%= case project.project_status&.name
+                                <%= case organization.organization_status&.name
                                     when "Active" then 'bg-green-100 text-green-800'
                                     when "Completed" then 'bg-blue-100 text-blue-800'
                                     when "Draft" then 'bg-yellow-100 text-yellow-800'
                                     when nil then ''
                                     else 'bg-gray-100 text-gray-800'
                                     end %>">
-                    <%= project.project_status&.name %>
+                    <%= organization.organization_status&.name %>
                   </span>
               </td>
 
               <td class="px-4 py-2 text-center">
-                <% if project.inactive? %>
+                <% if organization.inactive? %>
                   <span class="text-red-500 fa fa-ban"></span>
                 <% else %>
                   <span class="text-green-200 font-semibold fa fa-check-circle"></span>
@@ -96,10 +96,10 @@
 
               <td class="px-4 py-2 text-center whitespace-nowrap">
                 <% if current_user.super_user? %>
-                  <%= link_to "Edit", edit_project_path(project),
+                  <%= link_to "Edit", edit_organization_path(organization),
                               class: "admin-only bg-blue-100 btn btn-secondary-outline text-xs px-2 py-1" %>
                 <% end %>
-                <%= link_to "Profile", project_path(project),
+                <%= link_to "Profile", organization_path(organization),
                             class: "btn btn-secondary-outline text-xs px-2 py-1" %>
               </td>
             </tr>
@@ -112,7 +112,7 @@
       <!-- Pagination -->
       <div class="mt-6 flex justify-center">
         <div class="pagination mt-6">
-          <%= tailwind_paginate @projects %>
+          <%= tailwind_paginate @organizations %>
         </div>
       </div>
     </div>
diff --git a/app/views/projects/new.html.erb b/app/views/organizations/new.html.erb
similarity index 91%
rename from app/views/projects/new.html.erb
rename to app/views/organizations/new.html.erb
index ff157e229..d7a4cf0c0 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/organizations/new.html.erb
@@ -9,7 +9,7 @@
 
       <div class="space-y-6">
         <div class="mt-4">
-          <%= render "form", project: @project %>
+          <%= render "form" %>
         </div>
       </div>
     </div>
diff --git a/app/views/projects/show.html.erb b/app/views/organizations/show.html.erb
similarity index 72%
rename from app/views/projects/show.html.erb
rename to app/views/organizations/show.html.erb
index 8796ec645..e74476f89 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -4,12 +4,12 @@
       <!-- Header actions -->
       <div class="flex justify-end mb-6 gap-2">
 
-        <%= link_to "Organizations", projects_path, class: "btn btn-secondary-outline" %>
+        <%= link_to "Organizations", organizations_path, class: "btn btn-secondary-outline" %>
         <span class="inline-block text-sm">
-          <%= render "bookmarks/editable_bookmark_button", resource: @project %>
+          <%= render "bookmarks/editable_bookmark_button", resource: @organization %>
         </span>
         <% if current_user.super_user? %>
-          <%= link_to "Edit", edit_project_path(@project),
+          <%= link_to "Edit", edit_organization_path(@organization),
                       class: "admin-only bg-green-100 btn btn-primary-outline" %>
         <% end %>
       </div>
@@ -17,8 +17,8 @@
       <!-- Header: avatar + name + pronouns -->
       <div class="flex flex-col md:flex-row md:items-center md:gap-8 mb-10">
         <div class="flex-shrink-0 flex justify-center md:justify-start">
-          <% if @project.logo&.attached? %>
-            <%= image_tag url_for(@project.logo),
+          <% if @organization.logo&.attached? %>
+            <%= image_tag url_for(@organization.logo),
                           class: "w-32 h-32 rounded-full object-cover border border-gray-200 shadow-sm" %>
           <% else %>
             <%= image_tag "missing.png",
@@ -28,10 +28,10 @@
 
         <div class="flex-1 text-center md:text-left mt-4 md:mt-0">
           <h1 class="text-3xl font-bold text-gray-900">
-            <%= @project.name %>
+            <%= @organization.name %>
           </h1>
 
-          <% @project.addresses.each do |address| %>
+          <% @organization.addresses.each do |address| %>
             <p class="mt-3 text-gray-700 text-sm">
               <% if address.locality.present? %>
                 <br>
@@ -54,22 +54,22 @@
             </p>
           <% end %>
 
-          <% if @project.start_date.present? %>
+          <% if @organization.start_date.present? %>
             <p class="mt-3 text-gray-700 text-sm">
               Affiliated since
-              <span class="font-medium"><%= @project.start_date.year %></span>
+              <span class="font-medium"><%= @organization.start_date.year %></span>
             </p>
           <% end %>
 
           <!-- Optional social links -->
           <div class="mt-4">
-            <%= render "projects/social_media_buttons", project: @project if false %>
+            <%= render "organizations/social_media_buttons", organization: @organization if false %>
           </div>
         </div>
 
         <div class="flex-1">
           <div class="mt-4 flex flex-wrap justify-center md:justify-start gap-2">
-            <% @project.decorate.badges.each do |(label, color)| %>
+            <% @organization.decorate.badges.each do |(label, color)| %>
                 <span class="px-3 py-1 bg-<%= color %>-100 text-<%= color %>-800 text-sm font-semibold rounded-full">
                   <%= label %>
                 </span>
@@ -85,9 +85,9 @@
         <!-- Organization affiliations -->
         <div>
           <h2 class="text-lg font-semibold text-gray-800 mb-3">Windows facilitators</h2>
-          <% if @project.project_users.active.any? %>
+          <% if @organization.organization_users.active.any? %>
             <ul class="space-y-2">
-              <% @project.project_users.active.each do |pu| %>
+              <% @organization.organization_users.active.each do |pu| %>
                 <li class="whitespace-nowrap">
                   <%= pu.user.facilitator ? facilitator_profile_button(pu.user.facilitator) : pu.user.name %>
                   <% if pu.position.present? %>
@@ -102,13 +102,13 @@
         </div>
 
         <!-- Sectors -->
-        <% if true || @project.profile_show_sectors? %>
+        <% if true || @organization.profile_show_sectors? %>
           <div>
             <h2 class="text-lg font-semibold text-gray-800 mb-3">Service Populations</h2>
             <p>
-              <% if @project.sectorable_items.any? %>
+              <% if @organization.sectorable_items.any? %>
                 <div class="flex flex-wrap gap-2">
-                  <% @project.sectorable_items.joins(:sector).order("sectors.name").map do |si| %>
+                  <% @organization.sectorable_items.joins(:sector).order("sectors.name").map do |si| %>
                     <%= render "sectors/tagging_label",
                                sector: si.sector,
                                display_leader: true,
@@ -124,23 +124,23 @@
 
         <!-- Contact info -->
         <div>
-          <% if true || @project.profile_show_email? || @project.profile_show_phone? %>
+          <% if true || @organization.profile_show_email? || @organization.profile_show_phone? %>
             <h2 class="text-lg font-semibold text-gray-800 mb-3">Contact Information</h2>
-            <% if true || @project.profile_show_email? %>
+            <% if true || @organization.profile_show_email? %>
               <p class="text-gray-700 mb-1">
-                📧 <%#= mail_to @project.email, @project.email,
+                📧 <%#= mail_to @organization.email, @organization.email,
                               class: "text-blue-600 hover:underline" %>
               </p>
             <% end %>
-            <% if true || @project.profile_show_phone? && @project.phone.present? %>
+            <% if true || @organization.profile_show_phone? && @organization.phone.present? %>
               <p class="text-gray-700 mb-1">
-                📞 <%#= link_to @project.phone, "tel:#{@project.phone}",
+                📞 <%#= link_to @organization.phone, "tel:#{@organization.phone}",
                               class: "text-blue-600 hover:underline" %>
               </p>
             <% end %>
-            <% if true || @project.profile_show_website? && @project.website_url.present? %>
+            <% if true || @organization.profile_show_website? && @organization.website_url.present? %>
               <p class="text-gray-700 mb-1">
-                🌎 <%#= link_to @project.website_url,
+                🌎 <%#= link_to @organization.website_url,
                               class: "text-blue-600 hover:underline" %>
               </p>
             <% end %>
@@ -151,18 +151,18 @@
       <hr class="my-8 border-gray-200">
 
       <!-- Workshops authored -->
-      <% if true || @project.profile_show_description? && @project.description.present? %>
+      <% if true || @organization.profile_show_description? && @organization.description.present? %>
         <h2 class="text-lg font-semibold text-gray-800 mb-3">Description</h2>
-        <%= sanitize(@project.description, tags: %w[p br strong em a ul ol li b i], attributes: %w[href]) %>
+        <%= sanitize(@organization.description, tags: %w[p br strong em a ul ol li b i], attributes: %w[href]) %>
         <hr class="my-8 border-gray-200">
       <% end %>
 
       <!-- Workshops authored -->
-      <% if true || @project.profile_show_workshops? %>
+      <% if true || @organization.profile_show_workshops? %>
         <div>
           <h2 class="text-lg font-semibold text-gray-800 mb-3">Workshops authored</h2>
-          <% if false && @project.workshops.any? %>
-            <% @project.workshops.each do |workshop| %>
+          <% if false && @organization.workshops.any? %>
+            <% @organization.workshops.each do |workshop| %>
               <%= link_to workshop.name, workshop_path(workshop), class: "btn btn-secondary-outline" %>
             <% end %>
           <% else %>
@@ -172,10 +172,10 @@
       <% end %>
 
       <!-- Stories authored -->
-      <% if true || @project.profile_show_stories? %>
+      <% if true || @organization.profile_show_stories? %>
         <div class="mt-10">
           <h2 class="text-lg font-semibold text-gray-800 mb-3">Stories</h2>
-          <%# stories = @project.stories_as_creator + @project.stories_as_spotlighted_project %>
+          <%# stories = @organization.stories_as_creator + @organization.stories_as_spotlighted_organization %>
           <%# if stories.any? %>
             <%# stories.each do |story| %>
               <%#= link_to story.title, story_path(story), class: "btn btn-secondary-outline" %>
@@ -187,7 +187,7 @@
       <% end %>
 
       <!-- Events registered -->
-      <% if true || @project.profile_show_events_registered? %>
+      <% if true || @organization.profile_show_events_registered? %>
         <div class="mt-10">
           <h2 class="text-lg font-semibold text-gray-800 mb-3">Events hosted</h2>
           <%# if Event.all.any? %>
@@ -203,14 +203,14 @@
 
       <hr class="my-8 border-gray-200">
 
-      <% if current_user.super_user || @project.project_users.pluck(:user_id).include?(current_user.id) %>
-        <div class="project-only bg-green-100">
+      <% if current_user.super_user || @organization.organization_users.pluck(:user_id).include?(current_user.id) %>
+        <div class="organization-only bg-green-100">
           <!-- Workshop logs -->
-          <% if true || @project.profile_show_workshop_logs? %>
+          <% if true || @organization.profile_show_workshop_logs? %>
             <div class="mt-6 p-3">
               <h2 class="text-lg font-semibold text-gray-800 mb-3">Workshop Logs submitted</h2>
-              <% if false && @project.workshop_logs.any? %>
-                <% @project.workshop_logs.order(date: :desc, created_at: :desc).each do |workshop_log| %>
+              <% if false && @organization.workshop_logs.any? %>
+                <% @organization.workshop_logs.order(date: :desc, created_at: :desc).each do |workshop_log| %>
                   <%= link_to workshop_log.full_name,
                               workshop_log_path(workshop_log), class: "btn btn-secondary-outline" %>
                 <% end %>
diff --git a/app/views/shared/_project_user.html.erb b/app/views/shared/_organization_user.html.erb
similarity index 87%
rename from app/views/shared/_project_user.html.erb
rename to app/views/shared/_organization_user.html.erb
index a5f40f6e4..98288bf6a 100644
--- a/app/views/shared/_project_user.html.erb
+++ b/app/views/shared/_organization_user.html.erb
@@ -1,4 +1,4 @@
-<% user = project_user.user.decorate %>
+<% user = organization_user.user.decorate %>
 <% unless user == current_user %>
   <%= link_to user_path(user) do %>
     <li class="nav-item sub-nav-item" id="js-user-<%= user.id %>">
@@ -11,7 +11,7 @@
         <div class="col-md-8 white text-left users-group">
           <%= user.name %>
           <div class="smaller white text-left">
-            <%= project_user.position %>
+            <%= organization_user.position %>
             <p>
               <%= "Last logged in #{user.last_logged_in}" %>
             </p>
diff --git a/app/views/users/_project_user_fields.html.erb b/app/views/users/_organization_user_fields.html.erb
similarity index 91%
rename from app/views/users/_project_user_fields.html.erb
rename to app/views/users/_organization_user_fields.html.erb
index a81060233..0dbf83ace 100644
--- a/app/views/users/_project_user_fields.html.erb
+++ b/app/views/users/_organization_user_fields.html.erb
@@ -1,11 +1,11 @@
 <div class="nested-fields rounded-lg border border-gray-200 bg-gray-50 p-4 mb-4 shadow-sm">
   <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
     <div>
-      <%= f.input :project_id,
+      <%= f.input :organization_id,
                   as: :select,
                   label: "Organization",
-                  collection: @projects_array,
-                  selected: f.object.project_id,
+                  collection: @organizations_array,
+                  selected: f.object.organization_id,
                   input_html: {
                     class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500"
                   },

From 8aae4d0ae720086335e8e1fcc1021e46f8433cc8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 20 Jan 2026 01:14:18 +0000
Subject: [PATCH 4/5] Remove old Project files and update factories/specs

Co-authored-by: maebeale <7607813+maebeale@users.noreply.github.com>
---
 .../project_statuses_controller.rb            |  68 ---------
 app/controllers/project_users_controller.rb   |  13 --
 app/controllers/projects_controller.rb        | 137 -----------------
 app/decorators/project_decorator.rb           |  29 ----
 app/decorators/project_status_decorator.rb    |   3 -
 app/decorators/project_user_decorator.rb      |   5 -
 app/models/project.rb                         | 107 -------------
 app/models/project_obligation.rb              |   5 -
 app/models/project_status.rb                  |   7 -
 app/models/project_user.rb                    |  17 ---
 .../decorators/organization_decorator_spec.rb |   4 +
 .../organization_status_decorator_spec.rb     |   4 +
 spec/decorators/project_decorator_spec.rb     |   4 -
 .../project_status_decorator_spec.rb          |   4 -
 spec/factories/addresses.rb                   |   2 +-
 spec/factories/community_news.rb              |   2 +-
 ...gations.rb => organization_obligations.rb} |   2 +-
 ...t_statuses.rb => organization_statuses.rb} |   2 +-
 ...project_users.rb => organization_users.rb} |   4 +-
 .../{projects.rb => organizations.rb}         |   4 +-
 spec/factories/reports.rb                     |   2 +-
 spec/factories/stories.rb                     |   2 +-
 spec/factories/story_ideas.rb                 |   4 +-
 spec/lib/domain_theme_spec.rb                 |   4 +-
 spec/models/location_spec.rb                  |   2 +-
 spec/models/monthly_report_spec.rb            |   2 +-
 ...pec.rb => organization_obligation_spec.rb} |   8 +-
 .../{project_spec.rb => organization_spec.rb} |  14 +-
 ...us_spec.rb => organization_status_spec.rb} |   6 +-
 ...user_spec.rb => organization_user_spec.rb} |  12 +-
 spec/models/report_spec.rb                    |   2 +-
 spec/models/user_spec.rb                      |  10 +-
 spec/models/workshop_log_spec.rb              |   2 +-
 spec/requests/community_news_spec.rb          |   2 +-
 ..._spec.rb => organization_statuses_spec.rb} |  70 ++++-----
 spec/requests/organizations_spec.rb           | 143 ++++++++++++++++++
 spec/requests/projects_spec.rb                | 143 ------------------
 spec/requests/resources_spec.rb               |   2 +-
 spec/requests/stories_spec.rb                 |   4 +-
 spec/requests/story_ideas_spec.rb             |   4 +-
 spec/requests/workshop_logs_spec.rb           |   4 +-
 .../organization_statuses_routing_spec.rb     |  38 +++++
 spec/routing/organizations_routing_spec.rb    |  38 +++++
 spec/routing/project_statuses_routing_spec.rb |  38 -----
 spec/routing/projects_routing_spec.rb         |  38 -----
 .../community_news/edit.html.erb_spec.rb      |   4 +-
 .../community_news/index.html.erb_spec.rb     |   4 +-
 .../views/community_news/new.html.erb_spec.rb |   4 +-
 .../community_news/show.html.erb_spec.rb      |   2 +-
 .../edit.html.erb_spec.rb                     |  19 +++
 .../index.html.erb_spec.rb                    |  23 +++
 .../new.html.erb_spec.rb                      |  19 +++
 .../show.html.erb_spec.rb                     |   6 +-
 .../views/organizations/edit.html.erb_spec.rb |  43 ++++++
 .../organizations/index.html.erb_spec.rb      |  25 +++
 spec/views/organizations/new.html.erb_spec.rb |  28 ++++
 .../show.html.erb_spec.rb                     |   8 +-
 .../project_statuses/edit.html.erb_spec.rb    |  19 ---
 .../project_statuses/index.html.erb_spec.rb   |  23 ---
 .../project_statuses/new.html.erb_spec.rb     |  19 ---
 spec/views/projects/edit.html.erb_spec.rb     |  43 ------
 spec/views/projects/index.html.erb_spec.rb    |  25 ---
 spec/views/projects/new.html.erb_spec.rb      |  28 ----
 spec/views/stories/edit.html.erb_spec.rb      |   4 +-
 spec/views/stories/new.html.erb_spec.rb       |   4 +-
 spec/views/stories/show.html.erb_spec.rb      |   2 +-
 .../show_with_story_idea.html.erb_spec.rb     |   2 +-
 spec/views/story_ideas/edit.html.erb_spec.rb  |   4 +-
 spec/views/story_ideas/new.html.erb_spec.rb   |   4 +-
 spec/views/story_ideas/show.html.erb_spec.rb  |   2 +-
 spec/views/users/show.html.erb_spec.rb        |   4 +-
 71 files changed, 497 insertions(+), 888 deletions(-)
 delete mode 100644 app/controllers/project_statuses_controller.rb
 delete mode 100644 app/controllers/project_users_controller.rb
 delete mode 100644 app/controllers/projects_controller.rb
 delete mode 100644 app/decorators/project_decorator.rb
 delete mode 100644 app/decorators/project_status_decorator.rb
 delete mode 100644 app/decorators/project_user_decorator.rb
 delete mode 100644 app/models/project.rb
 delete mode 100644 app/models/project_obligation.rb
 delete mode 100644 app/models/project_status.rb
 delete mode 100644 app/models/project_user.rb
 create mode 100644 spec/decorators/organization_decorator_spec.rb
 create mode 100644 spec/decorators/organization_status_decorator_spec.rb
 delete mode 100644 spec/decorators/project_decorator_spec.rb
 delete mode 100644 spec/decorators/project_status_decorator_spec.rb
 rename spec/factories/{project_obligations.rb => organization_obligations.rb} (63%)
 rename spec/factories/{project_statuses.rb => organization_statuses.rb} (68%)
 rename spec/factories/{project_users.rb => organization_users.rb} (56%)
 rename spec/factories/{projects.rb => organizations.rb} (68%)
 rename spec/models/{project_obligation_spec.rb => organization_obligation_spec.rb} (61%)
 rename spec/models/{project_spec.rb => organization_spec.rb} (65%)
 rename spec/models/{project_status_spec.rb => organization_status_spec.rb} (52%)
 rename spec/models/{project_user_spec.rb => organization_user_spec.rb} (51%)
 rename spec/requests/{project_statuses_spec.rb => organization_statuses_spec.rb} (54%)
 create mode 100644 spec/requests/organizations_spec.rb
 delete mode 100644 spec/requests/projects_spec.rb
 create mode 100644 spec/routing/organization_statuses_routing_spec.rb
 create mode 100644 spec/routing/organizations_routing_spec.rb
 delete mode 100644 spec/routing/project_statuses_routing_spec.rb
 delete mode 100644 spec/routing/projects_routing_spec.rb
 create mode 100644 spec/views/organization_statuses/edit.html.erb_spec.rb
 create mode 100644 spec/views/organization_statuses/index.html.erb_spec.rb
 create mode 100644 spec/views/organization_statuses/new.html.erb_spec.rb
 rename spec/views/{project_statuses => organization_statuses}/show.html.erb_spec.rb (56%)
 create mode 100644 spec/views/organizations/edit.html.erb_spec.rb
 create mode 100644 spec/views/organizations/index.html.erb_spec.rb
 create mode 100644 spec/views/organizations/new.html.erb_spec.rb
 rename spec/views/{projects => organizations}/show.html.erb_spec.rb (51%)
 delete mode 100644 spec/views/project_statuses/edit.html.erb_spec.rb
 delete mode 100644 spec/views/project_statuses/index.html.erb_spec.rb
 delete mode 100644 spec/views/project_statuses/new.html.erb_spec.rb
 delete mode 100644 spec/views/projects/edit.html.erb_spec.rb
 delete mode 100644 spec/views/projects/index.html.erb_spec.rb
 delete mode 100644 spec/views/projects/new.html.erb_spec.rb

diff --git a/app/controllers/project_statuses_controller.rb b/app/controllers/project_statuses_controller.rb
deleted file mode 100644
index c3abc4319..000000000
--- a/app/controllers/project_statuses_controller.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-class ProjectStatusesController < Admin::BaseController
-  before_action :set_project_status, only: [ :show, :edit, :update, :destroy ]
-
-  def index
-    per_page = params[:number_of_items_per_page].presence || 25
-    unfiltered = ProjectStatus.all
-    @count_display = unfiltered.count
-    @project_statuses = unfiltered.paginate(page: params[:page], per_page: per_page).decorate
-  end
-
-  def show
-    @project_status = @project_status.decorate
-  end
-
-  def new
-    @project_status = ProjectStatus.new.decorate
-    set_form_variables
-  end
-
-  def edit
-    @project_status = @project_status.decorate
-    set_form_variables
-  end
-
-  def create
-    @project_status = ProjectStatus.new(project_status_params)
-
-    if @project_status.save
-      redirect_to project_statuses_path, notice: "Project status was successfully created."
-    else
-      @project_status = ProjectStatus.new.decorate
-      set_form_variables
-      render :new, status: :unprocessable_content
-    end
-  end
-
-  def update
-    if @project_status.update(project_status_params)
-      redirect_to project_statuses_path, notice: "Project status was successfully updated.", status: :see_other
-    else
-      @project_status = ProjectStatus.new.decorate
-      set_form_variables
-      render :edit, status: :unprocessable_content
-    end
-  end
-
-  def destroy
-    @project_status.destroy!
-    redirect_to project_statuses_path, notice: "Project status was successfully destroyed."
-  end
-
-  # Optional hooks for setting variables for forms or index
-  def set_form_variables
-  end
-
-  private
-
-  def set_project_status
-    @project_status = ProjectStatus.find(params[:id])
-  end
-
-  # Strong parameters
-  def project_status_params
-    params.require(:project_status).permit(
-      :name
-    )
-  end
-end
diff --git a/app/controllers/project_users_controller.rb b/app/controllers/project_users_controller.rb
deleted file mode 100644
index e0e7d535a..000000000
--- a/app/controllers/project_users_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class ProjectUsersController < ApplicationController
-  def destroy
-    project_user = ProjectUser.find(params[:id])
-    user = project_user.user
-
-    if project_user.destroy
-      flash[:notice] = "Project user has been deleted."
-    else
-      flash[:alert] = "Unable to delete project user.  Please contact AWBW."
-    end
-    redirect_to generate_facilitator_user_path(user)
-  end
-end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
deleted file mode 100644
index 3342756eb..000000000
--- a/app/controllers/projects_controller.rb
+++ /dev/null
@@ -1,137 +0,0 @@
-class ProjectsController < ApplicationController
-  before_action :set_project, only: [ :show, :edit, :update, :destroy ]
-
-  def index
-    per_page = params[:number_of_items_per_page].presence || 25
-    unpaginated = Project.search_by_params(params).order(:name)
-    @projects_count = unpaginated.count
-    @projects = unpaginated.paginate(page: params[:page], per_page: per_page)
-    set_index_variables
-  end
-
-  def show
-    @project.increment_view_count!(session: session, request: request)
-
-    # Reuse WorkshopLogsController#index logic programmatically
-    workshop_logs_controller = WorkshopLogsController.new
-    workshop_logs_controller.request = request
-    workshop_logs_controller.response = response
-    params[:project_id] = @project.id  # Inject context so the WorkshopLogsController#index scopes properly
-    workshop_logs_controller.params = params
-    workshop_logs_controller.index
-
-    workshop_logs = WorkshopLog.where(project_id: @project.id)
-    @month_year_options = workshop_logs.group("DATE_FORMAT(COALESCE(date, created_at, NOW()), '%Y-%m')")
-                                     .select("DATE_FORMAT(COALESCE(date, created_at, NOW()), '%Y-%m') AS ym,
-           MAX(COALESCE(date, created_at)) AS max_dt")
-                                     .order("max_dt DESC")
-                                     .map { |record| [ Date.strptime(record.ym, "%Y-%m").strftime("%B %Y"), record.ym ] }
-
-    @year_options = workshop_logs.pluck(
-      Arel.sql("DISTINCT EXTRACT(YEAR FROM COALESCE(date, created_at, NOW()))")
-    ).sort.reverse
-    @projects = Project.where(id: @project.id)
-    @per_page = params[:per_page] || 10
-    @workshop_logs_unpaginated = workshop_logs
-    @workshop_logs_count = @workshop_logs_unpaginated.size
-    @workshop_logs = @workshop_logs_unpaginated.paginate(page: params[:page], per_page: @per_page)
-    @facilitators = User.active.or(User.where(id: @workshop_logs_unpaginated.pluck(:user_id)))
-                        .joins(:workshop_logs)
-                        .distinct
-                        .order(:last_name, :first_name)
-  end
-
-  def new
-    @project = Project.new
-    set_form_variables
-  end
-
-  def edit
-    set_form_variables
-  end
-
-  def create
-    @project = Project.new(project_params)
-
-    if @project.save
-      redirect_to projects_path, notice: "Organization was successfully created."
-    else
-      set_form_variables
-      render :new, status: :unprocessable_content
-    end
-  end
-
-  def update
-    if @project.update(project_params)
-      redirect_to projects_path, notice: "Organization was successfully updated.", status: :see_other
-    else
-      set_form_variables
-      render :edit, status: :unprocessable_content
-    end
-  end
-
-  def destroy
-    @project.destroy!
-    redirect_to projects_path, notice: "Organization was successfully destroyed."
-  end
-
-  # Optional hooks for setting variables for forms or index
-  def set_form_variables
-    @project_statuses = ProjectStatus.all
-    @facilitators_array = Facilitator.joins(:user)
-                                     .order(:first_name, :last_name)
-                                     .map { |f| [ f.name, f.user.id ] }
-    @project.project_users = @project.project_users
-                                     .includes(:project)
-                                     .sort_by { |pu| pu.user.facilitator&.name.to_s.downcase }
-  end
-
-  def set_index_variables
-    @project_statuses = ProjectStatus.all
-  end
-
-  private
-
-  def set_project
-    @project = Project.find(params[:id])
-  end
-
-  # Strong parameters
-  def project_params
-    params.require(:project).permit(
-      :name, :description, :start_date, :end_date, :mission_vision_values, :internal_id,
-      :inactive, :logo, :notes, :agency_type,  :agency_type_other, :website_url,
-      :project_status_id, :location_id, :windows_type_id,
-      sectorable_items_attributes: [
-        :id,
-        :sector_id,
-        :_destroy
-      ],
-      project_users_attributes: [
-        :id,
-        :user_id,
-        :inactive,
-        :title,
-        :_destroy
-      ],
-      addresses_attributes: [
-        :id,
-        :address_type,
-        :inactive,
-        :phone,
-        :street_address,
-        :city,
-        :state,
-        :zip_code,
-        :county,
-        :country,
-        :district,
-        :locality,
-        :la_city_council_district,
-        :la_supervisorial_district,
-        :la_service_planning_area,
-        :_destroy
-      ]
-    )
-  end
-end
diff --git a/app/decorators/project_decorator.rb b/app/decorators/project_decorator.rb
deleted file mode 100644
index 4ac3de12a..000000000
--- a/app/decorators/project_decorator.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class ProjectDecorator < ApplicationDecorator
-  def detail(length: nil)
-    length ? description&.truncate(length) : description
-  end
-
-  def default_display_image
-    return logo if respond_to?(:logo) && logo&.attached?
-    "theme_default.png"
-  end
-
-  def title
-    name
-  end
-
-  def badges
-    years = start_date ? (Time.zone.now.year - start_date.year) : 0
-    badges = []
-    badges << [ "Legacy Organization (10+ years)", "yellow" ] if true || years >= 10
-    badges << [ "Seasoned Organization (3-10 years)", "gray" ] if true || start_date.present? && years >= 3
-    badges << [ "New Organization (<3 years)", "green" ] if true || start_date.present? && years < 3
-    badges << [ "Spotlighted Organization", "gray" ] if true || stories_as_spotlighted_facilitator
-    badges << [ "Events Hosted", "blue" ] if true || Event.count > 3
-    # badges << ["Workshop Author", "gray"] if true || user.workshops.any? # indigo
-    # badges << ["Story Author", "gray"] if true || user.stories_as_creator.any? # pink
-    # badges << ["Sector Leader", "purple"] if true || sectorable_items.where(is_leader: true).any?
-    badges << [ "Blog Contributor", "gray" ] if true # || user.respond_to?(:blogs) && user.blogs.any? # red
-    badges
-  end
-end
diff --git a/app/decorators/project_status_decorator.rb b/app/decorators/project_status_decorator.rb
deleted file mode 100644
index b295e8491..000000000
--- a/app/decorators/project_status_decorator.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-class ProjectStatusDecorator < Draper::Decorator
-  delegate_all
-end
diff --git a/app/decorators/project_user_decorator.rb b/app/decorators/project_user_decorator.rb
deleted file mode 100644
index eeeb34ac7..000000000
--- a/app/decorators/project_user_decorator.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ProjectUserDecorator < ApplicationDecorator
-  def detail(length: nil)
-    "#{user.full_name}: #{title.presence || position} - #{project.name}"
-  end
-end
diff --git a/app/models/project.rb b/app/models/project.rb
deleted file mode 100644
index 7e978c83f..000000000
--- a/app/models/project.rb
+++ /dev/null
@@ -1,107 +0,0 @@
-class Project < ApplicationRecord
-  include TagFilterable, Trendable, ViewCountable, WindowsTypeFilterable
-
-  belongs_to :project_status
-  belongs_to :project_obligation, optional: true
-  belongs_to :location, optional: true # TODO - remove Location if unused
-  belongs_to :windows_type, optional: true
-  has_many :addresses, as: :addressable, dependent: :destroy
-  has_many :bookmarks, as: :bookmarkable, dependent: :destroy
-  has_many :project_users, dependent: :restrict_with_error
-  has_many :users, through: :project_users
-  has_many :reports, through: :users
-  has_many :workshop_logs, through: :users
-
-  has_many :categorizable_items, dependent: :destroy, inverse_of: :categorizable, as: :categorizable
-  has_many :sectorable_items, as: :sectorable, dependent: :destroy
-  # has_many through
-  has_many :categories, through: :categorizable_items
-  has_many :sectors, through: :sectorable_items
-
-  # Asset associations
-  has_one_attached :logo
-
-  # Validations
-  validates :logo,
-            content_type: %w[image/png image/jpeg image/webp],
-            size: { less_than: 5.megabytes }
-  validates :name, presence: true
-  validates :project_status_id, presence: true
-
-  # Nested attributes
-  accepts_nested_attributes_for :addresses, allow_destroy: true, reject_if: :all_blank
-  accepts_nested_attributes_for :sectorable_items, allow_destroy: true, reject_if: :all_blank
-  accepts_nested_attributes_for :project_users, allow_destroy: true, reject_if: :all_blank
-
-  # SearchCop
-  include SearchCop
-  search_scope :search do
-    attributes :name
-  end
-
-  scope :address, ->(address) do
-    return all if address.blank?
-    exact = address.to_s
-    wildcard = "%#{exact}%"
-    left_joins(:addresses).where(
-      <<~SQL,
-      addresses.street_address LIKE :wildcard OR
-      addresses.city LIKE :wildcard OR
-      addresses.state LIKE :wildcard OR
-      addresses.county LIKE :wildcard OR
-      addresses.country LIKE :wildcard OR
-      addresses.district LIKE :wildcard OR
-      addresses.locality LIKE :wildcard OR
-      addresses.zip_code LIKE :exact OR
-      CAST(addresses.la_city_council_district AS CHAR) = :exact OR
-      CAST(addresses.la_service_planning_area AS CHAR) = :exact OR
-      CAST(addresses.la_supervisorial_district AS CHAR) = :exact
-    SQL
-      wildcard: wildcard, exact: exact)
-  end
-  scope :active, ->(active = nil) { active ? where(inactive: !active) : where(inactive: false) }
-  scope :by_most_viewed, ->(limit = 10) { order(view_count: :desc).limit(limit) }
-  scope :project_ids, ->(project_ids) { where(id: project_ids.to_s.split("-").map(&:to_i)) }
-  scope :published, ->(published = nil) { published ? active(published) : active }
-  scope :category_names, ->(names) { tag_names(:categories, names) }
-  scope :sector_names,   ->(names) { tag_names(:sectors, names) }
-
-  def self.search_by_params(params)
-    projects = self.all
-    projects = projects.search(params[:query]) if params[:query].present?
-    projects = projects.sector_names(params[:sector_names]) if params[:sector_names].present?
-    projects = projects.category_names(params[:category_names]) if params[:category_names].present?
-    projects = projects.address(params[:address]) if params[:address].present?
-    projects = projects.windows_type_name(params[:windows_type_name]) if params[:windows_type_name].present?
-    projects = projects.project_ids(params[:project_ids]) if params[:project_ids].present?
-    projects
-  end
-
-  # Methods
-  def led_by?(user)
-    return false unless leader
-    leader.user == user
-  end
-
-  def type_name
-    "#{name} #{ " (#{windows_type.short_name})" if windows_type}"
-  end
-
-  def organization_description
-    "#{name}, #{organization_locality}"
-  end
-
-  def organization_locality
-    addresses.active.first&.locality
-  end
-
-  def sector_list
-    sectors.pluck(:name)
-  end
-
-  private
-
-  def leader
-    project_users.find_by(position: 2)
-  end
-end
diff --git a/app/models/project_obligation.rb b/app/models/project_obligation.rb
deleted file mode 100644
index 0eed854e9..000000000
--- a/app/models/project_obligation.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ProjectObligation < ApplicationRecord
-  OBLIGATION_TYPES = [ "Current Grant Funded", "Previous Grant Funded",
-                      "Voluntary Reporting", "Intermittent Reporting",
-                      "Active Non-Reporting" ]
-end
diff --git a/app/models/project_status.rb b/app/models/project_status.rb
deleted file mode 100644
index 0e1d6a949..000000000
--- a/app/models/project_status.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class ProjectStatus < ApplicationRecord
-  PROJECT_STATUSES = [ "Active", "Inactive", "Pending", "Reinstate", "Suspended", "Unknown" ]
-
-  has_many :projects
-
-  validates :name, presence: true, uniqueness: true
-end
diff --git a/app/models/project_user.rb b/app/models/project_user.rb
deleted file mode 100644
index d68313262..000000000
--- a/app/models/project_user.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class ProjectUser < ApplicationRecord
-  belongs_to :project
-  belongs_to :user
-
-  # Validations
-  validates_presence_of :project_id
-
-  # Enum
-  enum :position, { default: 0, liaison: 1, leader: 2, assistant: 3 }
-
-  scope :active, -> { where(inactive: false) }
-
-  # Methods
-  def name
-    "#{user.name}" if user
-  end
-end
diff --git a/spec/decorators/organization_decorator_spec.rb b/spec/decorators/organization_decorator_spec.rb
new file mode 100644
index 000000000..77b6aa688
--- /dev/null
+++ b/spec/decorators/organization_decorator_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe OrganizationDecorator do
+end
diff --git a/spec/decorators/organization_status_decorator_spec.rb b/spec/decorators/organization_status_decorator_spec.rb
new file mode 100644
index 000000000..2c3f06b36
--- /dev/null
+++ b/spec/decorators/organization_status_decorator_spec.rb
@@ -0,0 +1,4 @@
+require 'rails_helper'
+
+RSpec.describe OrganizationStatusDecorator do
+end
diff --git a/spec/decorators/project_decorator_spec.rb b/spec/decorators/project_decorator_spec.rb
deleted file mode 100644
index ad38d2eb4..000000000
--- a/spec/decorators/project_decorator_spec.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe ProjectDecorator do
-end
diff --git a/spec/decorators/project_status_decorator_spec.rb b/spec/decorators/project_status_decorator_spec.rb
deleted file mode 100644
index 9f88999eb..000000000
--- a/spec/decorators/project_status_decorator_spec.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe ProjectStatusDecorator do
-end
diff --git a/spec/factories/addresses.rb b/spec/factories/addresses.rb
index 5385decd5..df7813b93 100644
--- a/spec/factories/addresses.rb
+++ b/spec/factories/addresses.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :address do
-    association :addressable, factory: :project
+    association :addressable, factory: :organization
 
     street_address { Faker::Address.street_address }
     city { Faker::Address.city }
diff --git a/spec/factories/community_news.rb b/spec/factories/community_news.rb
index 538fb839b..e63d6f07d 100644
--- a/spec/factories/community_news.rb
+++ b/spec/factories/community_news.rb
@@ -8,7 +8,7 @@
     inactive { false }
     author { "MyString" }
     reference_url { "MyString" }
-    project { nil }
+    organization { nil }
     windows_type { nil }
     workshop { nil }
     created_by { nil }
diff --git a/spec/factories/project_obligations.rb b/spec/factories/organization_obligations.rb
similarity index 63%
rename from spec/factories/project_obligations.rb
rename to spec/factories/organization_obligations.rb
index e9315b669..ff1444fab 100644
--- a/spec/factories/project_obligations.rb
+++ b/spec/factories/organization_obligations.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :project_obligation do
+  factory :organization_obligation do
     name { "Current Grant Funded" }
   end
 end
diff --git a/spec/factories/project_statuses.rb b/spec/factories/organization_statuses.rb
similarity index 68%
rename from spec/factories/project_statuses.rb
rename to spec/factories/organization_statuses.rb
index 0c459743c..27e2264e7 100644
--- a/spec/factories/project_statuses.rb
+++ b/spec/factories/organization_statuses.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :project_status do
+  factory :organization_status do
     sequence(:name) { |n| "Status #{n}" }
   end
 end
diff --git a/spec/factories/project_users.rb b/spec/factories/organization_users.rb
similarity index 56%
rename from spec/factories/project_users.rb
rename to spec/factories/organization_users.rb
index 5db0f5344..302ca42e3 100644
--- a/spec/factories/project_users.rb
+++ b/spec/factories/organization_users.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
-  factory :project_user do
-    association :project
+  factory :organization_user do
+    association :organization
     association :user
 
     position { :default }
diff --git a/spec/factories/projects.rb b/spec/factories/organizations.rb
similarity index 68%
rename from spec/factories/projects.rb
rename to spec/factories/organizations.rb
index 778741fb5..b122c35b7 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/organizations.rb
@@ -1,8 +1,8 @@
 FactoryBot.define do
-  factory :project do
+  factory :organization do
     name { Faker::Company.name.gsub("'", " ") }
     # association :windows_type
     # association :location
-    association :project_status
+    association :organization_status
   end
 end
diff --git a/spec/factories/reports.rb b/spec/factories/reports.rb
index 505689d25..423280e2b 100644
--- a/spec/factories/reports.rb
+++ b/spec/factories/reports.rb
@@ -2,7 +2,7 @@
   factory :report do
     # Associations
     association :user
-    association :project
+    association :organization
     association :windows_type # Needed by callbacks/logic
     # Polymorphic association: belongs_to :owner (can be nil or another model like FormBuilder)
     owner { nil } # Default owner
diff --git a/spec/factories/stories.rb b/spec/factories/stories.rb
index 7c429cf2a..6abc7a8af 100644
--- a/spec/factories/stories.rb
+++ b/spec/factories/stories.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :story do
     association :windows_type
-    association :project
+    association :organization
     association :workshop
     title { Faker::Lorem.sentence }
     body { "My Body" }
diff --git a/spec/factories/story_ideas.rb b/spec/factories/story_ideas.rb
index 865e5ab75..ff6084bfc 100644
--- a/spec/factories/story_ideas.rb
+++ b/spec/factories/story_ideas.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :story_idea do
     association :windows_type
-    association :project
+    association :organization
     association :workshop
     title { "My Title" }
     body { "My Body" }
@@ -17,7 +17,7 @@
                body: story_idea.body,
                workshop: story_idea.workshop,
                windows_type: story_idea.windows_type,
-               project: story_idea.project,
+               project: story_idea.organization,
                created_by: story_idea.created_by,
                story_idea: story_idea)
       end
diff --git a/spec/lib/domain_theme_spec.rb b/spec/lib/domain_theme_spec.rb
index d6c18b4da..a90552168 100644
--- a/spec/lib/domain_theme_spec.rb
+++ b/spec/lib/domain_theme_spec.rb
@@ -31,7 +31,7 @@
     end
 
     it "defines a color for every taggable dashboard type" do
-      # Tag::TAGGABLE_META keys: workshops, resources, community_news, stories, events, facilitators, projects, quotes
+      # Tag::TAGGABLE_META keys: workshops, resources, community_news, stories, events, facilitators, organizations, quotes
       expect(DomainTheme::COLORS.keys)
         .to include(*Tag::TAGGABLE_META.keys)
     end
@@ -43,7 +43,7 @@
     end
 
     it "symbolizes string keys" do
-      expect(DomainTheme.color_for("projects")).to eq(:emerald)
+      expect(DomainTheme.color_for("organizations")).to eq(:emerald)
     end
 
     it "returns gray for unknown keys" do
diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb
index 0c21e12dc..cfaaf0877 100644
--- a/spec/models/location_spec.rb
+++ b/spec/models/location_spec.rb
@@ -4,7 +4,7 @@
   # let(:location) { build(:location) } # Keep if needed
 
   describe 'associations' do
-    # it { should have_many(:projects) } # Model missing has_many
+    # it { should have_many(:organizations) } # Model missing has_many
   end
 
   describe 'validations' do
diff --git a/spec/models/monthly_report_spec.rb b/spec/models/monthly_report_spec.rb
index d14eeb535..a9a7e30c7 100644
--- a/spec/models/monthly_report_spec.rb
+++ b/spec/models/monthly_report_spec.rb
@@ -18,7 +18,7 @@
   it 'is valid with valid attributes' do
     # Note: Factory needs associations uncommented for create (from Report factory)
     # expect(build(:monthly_report)).to be_valid
-    # pending("Requires functional user/project/windows_type factories and associations")
+    # pending("Requires functional user/organization/windows_type factories and associations")
   end
 
   # Add tests specific to MonthlyReport if any
diff --git a/spec/models/project_obligation_spec.rb b/spec/models/organization_obligation_spec.rb
similarity index 61%
rename from spec/models/project_obligation_spec.rb
rename to spec/models/organization_obligation_spec.rb
index e2984b595..313c0b22e 100644
--- a/spec/models/project_obligation_spec.rb
+++ b/spec/models/organization_obligation_spec.rb
@@ -1,18 +1,18 @@
 require 'rails_helper'
 
-RSpec.describe ProjectObligation do
+RSpec.describe OrganizationObligation do
   describe 'associations' do
-    # Add association tests if any (e.g., has_many :projects?)
+    # Add association tests if any (e.g., has_many :organizations?)
   end
 
   describe 'validations' do
     # Assuming name should be present and unique
-    subject { build(:project_obligation) }
+    subject { build(:organization_obligation) }
     # it { should validate_presence_of(:name) } # Model missing validation
     # it { should validate_uniqueness_of(:name) } # Requires create
   end
 
   it 'is valid with valid attributes' do
-    expect(build(:project_obligation)).to be_valid
+    expect(build(:organization_obligation)).to be_valid
   end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/organization_spec.rb
similarity index 65%
rename from spec/models/project_spec.rb
rename to spec/models/organization_spec.rb
index 2e8333d97..3cea841d9 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/organization_spec.rb
@@ -1,29 +1,29 @@
 require 'rails_helper'
 
-RSpec.describe Project do
+RSpec.describe Organization do
   # pending "add some examples to (or delete) #{__FILE__}"
 
   describe 'associations' do
     it { should belong_to(:location).optional }
     it { should belong_to(:windows_type).optional }
-    it { should belong_to(:project_status) }
-    it { should have_many(:project_users) }
-    it { should have_many(:users).through(:project_users) }
+    it { should belong_to(:organization_status) }
+    it { should have_many(:organization_users) }
+    it { should have_many(:users).through(:organization_users) }
     it { should have_many(:reports).through(:users) }
     it { should have_many(:workshop_logs).through(:users) }
   end
 
   describe 'validations' do
     # Add validation tests if any (e.g., presence of name, associations)
-    subject { build(:project) } # Requires associations
+    subject { build(:organization) } # Requires associations
     it { should validate_presence_of(:name) }
     # it { should validate_presence_of(:location) }
     # it { should validate_presence_of(:windows_type) }
-    it { should validate_presence_of(:project_status_id) }
+    it { should validate_presence_of(:organization_status_id) }
   end
 
   it 'is valid with valid attributes' do
     # Note: Factory needs associations uncommented for create
-    # expect(build(:project)).to be_valid
+    # expect(build(:organization)).to be_valid
   end
 end
diff --git a/spec/models/project_status_spec.rb b/spec/models/organization_status_spec.rb
similarity index 52%
rename from spec/models/project_status_spec.rb
rename to spec/models/organization_status_spec.rb
index 7ab2e2cae..5f8f1c12a 100644
--- a/spec/models/project_status_spec.rb
+++ b/spec/models/organization_status_spec.rb
@@ -1,14 +1,14 @@
 require 'rails_helper'
 
-RSpec.describe ProjectStatus do
+RSpec.describe OrganizationStatus do
   describe 'associations' do
   end
 
   describe 'validations' do
-    subject { build(:project_status) }
+    subject { build(:organization_status) }
   end
 
   it 'is valid with valid attributes' do
-    expect(build(:project_status)).to be_valid
+    expect(build(:organization_status)).to be_valid
   end
 end
diff --git a/spec/models/project_user_spec.rb b/spec/models/organization_user_spec.rb
similarity index 51%
rename from spec/models/project_user_spec.rb
rename to spec/models/organization_user_spec.rb
index 1bfcad0ff..8ec22f92f 100644
--- a/spec/models/project_user_spec.rb
+++ b/spec/models/organization_user_spec.rb
@@ -1,16 +1,16 @@
 require 'rails_helper'
 
-RSpec.describe ProjectUser do
+RSpec.describe OrganizationUser do
   describe 'associations' do
-    it { should belong_to(:project) }
+    it { should belong_to(:organization) }
     it { should belong_to(:user) }
   end
 
   describe 'validations' do
     subject do
-      build(:project_user, project: create(:project), user: create(:user))
+      build(:organization_user, organization: create(:organization), user: create(:user))
     end
-    it { should validate_presence_of(:project_id) }
+    it { should validate_presence_of(:organization_id) }
   end
 
   describe 'enums' do
@@ -19,7 +19,7 @@
 
   it 'is valid with valid attributes' do
     # Note: Factory needs associations uncommented for create
-    # expect(build(:project_user)).to be_valid
-    # pending("Requires functional project/user factories and associations uncommented")
+    # expect(build(:organization_user)).to be_valid
+    # pending("Requires functional organization/user factories and associations uncommented")
   end
 end
diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb
index 356644b55..df5af7b71 100644
--- a/spec/models/report_spec.rb
+++ b/spec/models/report_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe Report do
   describe "associations" do
     it { should belong_to(:user) }
-    it { should belong_to(:project) }
+    it { should belong_to(:organization) }
     it { should belong_to(:windows_type) }
     it { should belong_to(:owner).optional }
     it { should have_one(:form) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2bd17fce6..bfb3f9638 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -18,14 +18,14 @@
     it { should have_many(:bookmarked_workshops).through(:bookmarks).source(:bookmarkable) }
     it { should have_many(:bookmarked_resources).through(:bookmarks).source(:bookmarkable) }
     it { should have_many(:bookmarked_events).through(:bookmarks).source(:bookmarkable) }
-    it { should have_many(:project_users).dependent(:destroy) }
-    it { should have_many(:projects).through(:project_users) }
-    it { should have_many(:windows_types).through(:projects) }
+    it { should have_many(:organization_users).dependent(:destroy) }
+    it { should have_many(:organizations).through(:organization_users) }
+    it { should have_many(:windows_types).through(:organizations) }
     it { should have_many(:resources) }
     it { should have_many(:user_forms).dependent(:destroy) }
     it { should have_many(:user_form_form_fields).through(:user_forms).dependent(:destroy) }
     # Custom scope/select for colleagues might interfere
-    # it { should have_many(:colleagues).through(:projects).source(:project_users) }
+    # it { should have_many(:colleagues).through(:organizations).source(:organization_users) }
     it { should have_many(:notifications) } # As :noticeable
 
     # Paperclip avatar
@@ -33,7 +33,7 @@
 
     # Nested Attributes
     it { should accept_nested_attributes_for(:user_forms) }
-    it { should accept_nested_attributes_for(:project_users).allow_destroy(true) }
+    it { should accept_nested_attributes_for(:organization_users).allow_destroy(true) }
   end
 
   describe "validations" do
diff --git a/spec/models/workshop_log_spec.rb b/spec/models/workshop_log_spec.rb
index 673103194..3d5691443 100644
--- a/spec/models/workshop_log_spec.rb
+++ b/spec/models/workshop_log_spec.rb
@@ -11,7 +11,7 @@
     # Explicitly defined here
     it { should belong_to(:workshop) }
     it { should belong_to(:user) } # Inherited via Report but also explicit?
-    it { should belong_to(:project) } # Inherited via Report but also explicit?
+    it { should belong_to(:organization) } # Inherited via Report but also explicit?
     it { should have_many(:media_files) }
 
     # Inherited from Report
diff --git a/spec/requests/community_news_spec.rb b/spec/requests/community_news_spec.rb
index 9aa921665..0cf7b5dc4 100644
--- a/spec/requests/community_news_spec.rb
+++ b/spec/requests/community_news_spec.rb
@@ -26,7 +26,7 @@
       featured: false,
       author_id: admin.id,
       reference_url: "www.google.com",
-      project: nil,
+      organization: nil,
       windows_type: nil,
       created_by_id: admin.id,
       updated_by_id: admin.id
diff --git a/spec/requests/project_statuses_spec.rb b/spec/requests/organization_statuses_spec.rb
similarity index 54%
rename from spec/requests/project_statuses_spec.rb
rename to spec/requests/organization_statuses_spec.rb
index e380eaf05..880fe4cd8 100644
--- a/spec/requests/project_statuses_spec.rb
+++ b/spec/requests/organization_statuses_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe "/project_statuses", type: :request do
+RSpec.describe "/organization_statuses", type: :request do
   let(:admin)        { create(:user, :admin) }
   let(:regular_user) { create(:user) }
 
@@ -20,57 +20,57 @@
 
     describe "GET /index" do
       it "renders successfully" do
-        get project_statuses_url
+        get organization_statuses_url
         expect(response).to be_successful
       end
     end
 
     describe "GET /show" do
       it "renders successfully" do
-        project_status = ProjectStatus.create!(valid_attributes)
-        get project_status_url(project_status)
+        organization_status = OrganizationStatus.create!(valid_attributes)
+        get organization_status_url(organization_status)
         expect(response).to be_successful
       end
     end
 
     describe "GET /new" do
       it "renders successfully" do
-        get new_project_status_url
+        get new_organization_status_url
         expect(response).to be_successful
       end
     end
 
     describe "GET /edit" do
       it "renders successfully" do
-        project_status = ProjectStatus.create!(valid_attributes)
-        get edit_project_status_url(project_status)
+        organization_status = OrganizationStatus.create!(valid_attributes)
+        get edit_organization_status_url(organization_status)
         expect(response).to be_successful
       end
     end
 
     describe "POST /create" do
       context "with valid params" do
-        it "creates a ProjectStatus" do
+        it "creates a OrganizationStatus" do
           expect {
-            post project_statuses_url, params: { project_status: valid_attributes }
-          }.to change(ProjectStatus, :count).by(1)
+            post organization_statuses_url, params: { organization_status: valid_attributes }
+          }.to change(OrganizationStatus, :count).by(1)
         end
 
         it "redirects to index" do
-          post project_statuses_url, params: { project_status: valid_attributes }
-          expect(response).to redirect_to(project_statuses_url)
+          post organization_statuses_url, params: { organization_status: valid_attributes }
+          expect(response).to redirect_to(organization_statuses_url)
         end
       end
 
       context "with invalid params" do
-        it "does not create a ProjectStatus" do
+        it "does not create a OrganizationStatus" do
           expect {
-            post project_statuses_url, params: { project_status: invalid_attributes }
-          }.not_to change(ProjectStatus, :count)
+            post organization_statuses_url, params: { organization_status: invalid_attributes }
+          }.not_to change(OrganizationStatus, :count)
         end
 
         it "returns 422" do
-          post project_statuses_url, params: { project_status: invalid_attributes }
+          post organization_statuses_url, params: { organization_status: invalid_attributes }
           expect(response).to have_http_status(:unprocessable_content)
         end
       end
@@ -78,25 +78,25 @@
 
     describe "PATCH /update" do
       it "updates and redirects" do
-        project_status = ProjectStatus.create!(valid_attributes)
+        organization_status = OrganizationStatus.create!(valid_attributes)
 
-        patch project_status_url(project_status),
-              params: { project_status: { name: "Updated" } }
+        patch organization_status_url(organization_status),
+              params: { organization_status: { name: "Updated" } }
 
-        expect(response).to redirect_to(project_statuses_url)
-        expect(project_status.reload.name).to eq("Updated")
+        expect(response).to redirect_to(organization_statuses_url)
+        expect(organization_status.reload.name).to eq("Updated")
       end
     end
 
     describe "DELETE /destroy" do
       it "destroys and redirects" do
-        project_status = ProjectStatus.create!(valid_attributes)
+        organization_status = OrganizationStatus.create!(valid_attributes)
 
         expect {
-          delete project_status_url(project_status)
-        }.to change(ProjectStatus, :count).by(-1)
+          delete organization_status_url(organization_status)
+        }.to change(OrganizationStatus, :count).by(-1)
 
-        expect(response).to redirect_to(project_statuses_url)
+        expect(response).to redirect_to(organization_statuses_url)
       end
     end
   end
@@ -108,35 +108,35 @@
     before { sign_in regular_user }
 
     it "cannot access index" do
-      get project_statuses_url
+      get organization_statuses_url
       expect(response).to redirect_to(authenticated_root_path)
     end
 
     it "cannot access show" do
-      ps = ProjectStatus.create!(valid_attributes)
-      get project_status_url(ps)
+      os = OrganizationStatus.create!(valid_attributes)
+      get organization_status_url(os)
       expect(response).to redirect_to(authenticated_root_path)
     end
 
     it "cannot access new" do
-      get new_project_status_url
+      get new_organization_status_url
       expect(response).to redirect_to(authenticated_root_path)
     end
 
     it "cannot create" do
-      post project_statuses_url, params: { project_status: valid_attributes }
+      post organization_statuses_url, params: { organization_status: valid_attributes }
       expect(response).to redirect_to(authenticated_root_path)
     end
 
     it "cannot edit" do
-      ps = ProjectStatus.create!(valid_attributes)
-      get edit_project_status_url(ps)
+      os = OrganizationStatus.create!(valid_attributes)
+      get edit_organization_status_url(os)
       expect(response).to redirect_to(authenticated_root_path)
     end
 
     it "cannot destroy" do
-      ps = ProjectStatus.create!(valid_attributes)
-      delete project_status_url(ps)
+      os = OrganizationStatus.create!(valid_attributes)
+      delete organization_status_url(os)
       expect(response).to redirect_to(authenticated_root_path)
     end
   end
@@ -146,7 +146,7 @@
   # --------------------------------------------------
   describe "unauthenticated access" do
     it "redirects to sign-in" do
-      get project_statuses_url
+      get organization_statuses_url
       expect(response).to redirect_to(new_user_session_path)
     end
   end
diff --git a/spec/requests/organizations_spec.rb b/spec/requests/organizations_spec.rb
new file mode 100644
index 000000000..4c000b67a
--- /dev/null
+++ b/spec/requests/organizations_spec.rb
@@ -0,0 +1,143 @@
+require "rails_helper"
+
+RSpec.describe "/organizations", type: :request do
+  let(:user) { create(:user) }
+  let(:admin) { create(:user, super_user: true) }
+
+  let!(:location) { create(:location) }
+  let!(:organization_status) { create(:organization_status, name: "Active") }
+
+  let(:valid_attributes) do
+    {
+      name: "Healing Through Art",
+      description: "A community program supporting trauma-informed workshops.",
+      start_date: Date.today - 6.months,
+      end_date: Date.today + 6.months,
+      organization_status_id: organization_status.id,
+      inactive: false,
+      notes: "Runs bi-weekly at community centers."
+    }
+  end
+
+  let(:invalid_attributes) do
+    {
+      name: "", # required field missing
+      description: nil,
+      organization_status_id: nil,
+      windows_type_id: nil
+    }
+  end
+
+  before do
+    sign_in admin
+  end
+
+  describe "GET /index" do
+    it "renders a successful response" do
+      Organization.create!(valid_attributes)
+      get organizations_url
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET /show" do
+    it "renders a successful response" do
+      organization = Organization.create!(valid_attributes)
+      get organization_url(organization)
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET /new" do
+    it "renders a successful response" do
+      get new_organization_url
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET /edit" do
+    it "renders a successful response" do
+      organization = Organization.create!(valid_attributes)
+      get edit_organization_url(organization)
+      expect(response).to be_successful
+    end
+  end
+
+  describe "POST /create" do
+    context "with valid parameters" do
+      it "creates a new Organization" do
+        expect {
+          post organizations_url, params: { organization: valid_attributes }
+        }.to change(Organization, :count).by(1)
+      end
+
+      it "redirects to the organizations index" do
+        post organizations_url, params: { organization: valid_attributes }
+        expect(response).to redirect_to(organizations_url)
+      end
+    end
+
+    context "with invalid parameters" do
+      it "does not create a new Organization" do
+        expect {
+          post organizations_url, params: { organization: invalid_attributes }
+        }.not_to change(Organization, :count)
+      end
+
+      it "renders a response with 422 status (i.e. to display the 'new' template)" do
+        post organizations_url, params: { organization: invalid_attributes }
+        expect(response).to have_http_status(:unprocessable_content)
+      end
+    end
+  end
+
+  describe "PATCH /update" do
+    context "with valid parameters" do
+      let(:new_attributes) do
+        {
+          name: "Updated Healing Organization",
+          description: "Updated description for testing.",
+          inactive: true
+        }
+      end
+
+      it "updates the requested organization" do
+        organization = Organization.create!(valid_attributes)
+        patch organization_url(organization), params: { organization: new_attributes }
+        organization.reload
+        expect(organization.name).to eq("Updated Healing Organization")
+        expect(organization.description).to eq("Updated description for testing.")
+        expect(organization.inactive).to be(true)
+      end
+
+      it "redirects to the organizations index" do
+        organization = Organization.create!(valid_attributes)
+        patch organization_url(organization), params: { organization: new_attributes }
+        expect(response).to redirect_to(organizations_url)
+      end
+    end
+
+    context "with invalid parameters" do
+      it "renders a response with 422 status (i.e. to display the 'edit' template)" do
+        organization = Organization.create!(valid_attributes)
+        patch organization_url(organization), params: { organization: invalid_attributes }
+        expect(response).to have_http_status(:unprocessable_content)
+      end
+    end
+  end
+
+  describe "DELETE /destroy" do
+    it "destroys the requested organization" do
+      organization = Organization.create!(valid_attributes)
+      expect {
+        delete organization_url(organization)
+      }.to change(Organization, :count).by(-1)
+    end
+
+    it "redirects to the organizations list" do
+      organization = Organization.create!(valid_attributes)
+      delete organization_url(organization)
+      expect(response).to redirect_to(organizations_url)
+    end
+  end
+end
diff --git a/spec/requests/projects_spec.rb b/spec/requests/projects_spec.rb
deleted file mode 100644
index 5cf5eaf05..000000000
--- a/spec/requests/projects_spec.rb
+++ /dev/null
@@ -1,143 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "/projects", type: :request do
-  let(:user) { create(:user) }
-  let(:admin) { create(:user, super_user: true) }
-
-  let!(:location) { create(:location) }
-  let!(:project_status) { create(:project_status, name: "Active") }
-
-  let(:valid_attributes) do
-    {
-      name: "Healing Through Art",
-      description: "A community program supporting trauma-informed workshops.",
-      start_date: Date.today - 6.months,
-      end_date: Date.today + 6.months,
-      project_status_id: project_status.id,
-      inactive: false,
-      notes: "Runs bi-weekly at community centers."
-    }
-  end
-
-  let(:invalid_attributes) do
-    {
-      name: "", # required field missing
-      description: nil,
-      project_status_id: nil,
-      windows_type_id: nil
-    }
-  end
-
-  before do
-    sign_in admin
-  end
-
-  describe "GET /index" do
-    it "renders a successful response" do
-      Project.create!(valid_attributes)
-      get projects_url
-      expect(response).to be_successful
-    end
-  end
-
-  describe "GET /show" do
-    it "renders a successful response" do
-      project = Project.create!(valid_attributes)
-      get project_url(project)
-      expect(response).to be_successful
-    end
-  end
-
-  describe "GET /new" do
-    it "renders a successful response" do
-      get new_project_url
-      expect(response).to be_successful
-    end
-  end
-
-  describe "GET /edit" do
-    it "renders a successful response" do
-      project = Project.create!(valid_attributes)
-      get edit_project_url(project)
-      expect(response).to be_successful
-    end
-  end
-
-  describe "POST /create" do
-    context "with valid parameters" do
-      it "creates a new Project" do
-        expect {
-          post projects_url, params: { project: valid_attributes }
-        }.to change(Project, :count).by(1)
-      end
-
-      it "redirects to the projects index" do
-        post projects_url, params: { project: valid_attributes }
-        expect(response).to redirect_to(projects_url)
-      end
-    end
-
-    context "with invalid parameters" do
-      it "does not create a new Project" do
-        expect {
-          post projects_url, params: { project: invalid_attributes }
-        }.not_to change(Project, :count)
-      end
-
-      it "renders a response with 422 status (i.e. to display the 'new' template)" do
-        post projects_url, params: { project: invalid_attributes }
-        expect(response).to have_http_status(:unprocessable_content)
-      end
-    end
-  end
-
-  describe "PATCH /update" do
-    context "with valid parameters" do
-      let(:new_attributes) do
-        {
-          name: "Updated Healing Project",
-          description: "Updated description for testing.",
-          inactive: true
-        }
-      end
-
-      it "updates the requested project" do
-        project = Project.create!(valid_attributes)
-        patch project_url(project), params: { project: new_attributes }
-        project.reload
-        expect(project.name).to eq("Updated Healing Project")
-        expect(project.description).to eq("Updated description for testing.")
-        expect(project.inactive).to be(true)
-      end
-
-      it "redirects to the projects index" do
-        project = Project.create!(valid_attributes)
-        patch project_url(project), params: { project: new_attributes }
-        expect(response).to redirect_to(projects_url)
-      end
-    end
-
-    context "with invalid parameters" do
-      it "renders a response with 422 status (i.e. to display the 'edit' template)" do
-        project = Project.create!(valid_attributes)
-        patch project_url(project), params: { project: invalid_attributes }
-        expect(response).to have_http_status(:unprocessable_content)
-      end
-    end
-  end
-
-  describe "DELETE /destroy" do
-    it "destroys the requested project" do
-      project = Project.create!(valid_attributes)
-      expect {
-        delete project_url(project)
-      }.to change(Project, :count).by(-1)
-    end
-
-    it "redirects to the projects list" do
-      project = Project.create!(valid_attributes)
-      delete project_url(project)
-      expect(response).to redirect_to(projects_url)
-    end
-  end
-end
diff --git a/spec/requests/resources_spec.rb b/spec/requests/resources_spec.rb
index 6ccadb196..319f9c880 100644
--- a/spec/requests/resources_spec.rb
+++ b/spec/requests/resources_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe "/resources", type: :request do
   let(:user)         { create(:user) }
   let(:windows_type) { create(:windows_type) }
-  let(:project)      { create(:project) }
+  let(:organization) { create(:organization) }
 
   let(:valid_attributes) do
     {
diff --git a/spec/requests/stories_spec.rb b/spec/requests/stories_spec.rb
index 311c09d71..bb9933d1c 100644
--- a/spec/requests/stories_spec.rb
+++ b/spec/requests/stories_spec.rb
@@ -19,7 +19,7 @@
   let(:user) { create(:user) }
   let(:windows_type) { create(:windows_type) }
   let(:workshop) { create(:workshop) }
-  let(:project) { create(:project) }
+  let(:organization) { create(:organization) }
 
   let(:valid_attributes) do
     {
@@ -30,7 +30,7 @@
       published: true,
       windows_type_id: windows_type.id,
       workshop_id: workshop.id,
-      project_id: project.id,
+      organization_id: organization.id,
       created_by_id: user.id,
       updated_by_id: user.id
     }
diff --git a/spec/requests/story_ideas_spec.rb b/spec/requests/story_ideas_spec.rb
index 911e498fd..0bf73cd74 100644
--- a/spec/requests/story_ideas_spec.rb
+++ b/spec/requests/story_ideas_spec.rb
@@ -21,7 +21,7 @@
 
   let(:windows_type) { create(:windows_type) }
   let(:workshop) { create(:workshop) }
-  let(:project) { create(:project) }
+  let(:organization) { create(:organization) }
 
   let(:valid_attributes) do
     {
@@ -31,7 +31,7 @@
       permission_given: true,
       windows_type_id: windows_type.id,
       workshop_id: workshop.id,
-      project_id: project.id,
+      organization_id: organization.id,
       created_by_id: user.id,
       updated_by_id: user.id
     }
diff --git a/spec/requests/workshop_logs_spec.rb b/spec/requests/workshop_logs_spec.rb
index 0fc8bc069..27ce60dde 100644
--- a/spec/requests/workshop_logs_spec.rb
+++ b/spec/requests/workshop_logs_spec.rb
@@ -6,13 +6,13 @@
   let(:user)         { create(:user) }
   let(:windows_type) { create(:windows_type) }
   let(:workshop)     { create(:workshop) }
-  let(:project)      { create(:project) }
+  let(:organization) { create(:organization) }
 
   let(:valid_attributes) do
     {
       date: Date.current,
       workshop_id: workshop.id,
-      project_id: project.id,
+      organization_id: organization.id,
       windows_type_id: windows_type.id,
       user_id: user.id,
 
diff --git a/spec/routing/organization_statuses_routing_spec.rb b/spec/routing/organization_statuses_routing_spec.rb
new file mode 100644
index 000000000..615fab3a1
--- /dev/null
+++ b/spec/routing/organization_statuses_routing_spec.rb
@@ -0,0 +1,38 @@
+require "rails_helper"
+
+RSpec.describe OrganizationStatusesController, type: :routing do
+  describe "routing" do
+    it "routes to #index" do
+      expect(get: "/organization_statuses").to route_to("organization_statuses#index")
+    end
+
+    it "routes to #new" do
+      expect(get: "/organization_statuses/new").to route_to("organization_statuses#new")
+    end
+
+    it "routes to #show" do
+      expect(get: "/organization_statuses/1").to route_to("organization_statuses#show", id: "1")
+    end
+
+    it "routes to #edit" do
+      expect(get: "/organization_statuses/1/edit").to route_to("organization_statuses#edit", id: "1")
+    end
+
+
+    it "routes to #create" do
+      expect(post: "/organization_statuses").to route_to("organization_statuses#create")
+    end
+
+    it "routes to #update via PUT" do
+      expect(put: "/organization_statuses/1").to route_to("organization_statuses#update", id: "1")
+    end
+
+    it "routes to #update via PATCH" do
+      expect(patch: "/organization_statuses/1").to route_to("organization_statuses#update", id: "1")
+    end
+
+    it "routes to #destroy" do
+      expect(delete: "/organization_statuses/1").to route_to("organization_statuses#destroy", id: "1")
+    end
+  end
+end
diff --git a/spec/routing/organizations_routing_spec.rb b/spec/routing/organizations_routing_spec.rb
new file mode 100644
index 000000000..8a6c631ab
--- /dev/null
+++ b/spec/routing/organizations_routing_spec.rb
@@ -0,0 +1,38 @@
+require "rails_helper"
+
+RSpec.describe OrganizationsController, type: :routing do
+  describe "routing" do
+    it "routes to #index" do
+      expect(get: "/organizations").to route_to("organizations#index")
+    end
+
+    it "routes to #new" do
+      expect(get: "/organizations/new").to route_to("organizations#new")
+    end
+
+    it "routes to #show" do
+      expect(get: "/organizations/1").to route_to("organizations#show", id: "1")
+    end
+
+    it "routes to #edit" do
+      expect(get: "/organizations/1/edit").to route_to("organizations#edit", id: "1")
+    end
+
+
+    it "routes to #create" do
+      expect(post: "/organizations").to route_to("organizations#create")
+    end
+
+    it "routes to #update via PUT" do
+      expect(put: "/organizations/1").to route_to("organizations#update", id: "1")
+    end
+
+    it "routes to #update via PATCH" do
+      expect(patch: "/organizations/1").to route_to("organizations#update", id: "1")
+    end
+
+    it "routes to #destroy" do
+      expect(delete: "/organizations/1").to route_to("organizations#destroy", id: "1")
+    end
+  end
+end
diff --git a/spec/routing/project_statuses_routing_spec.rb b/spec/routing/project_statuses_routing_spec.rb
deleted file mode 100644
index 62a654b04..000000000
--- a/spec/routing/project_statuses_routing_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require "rails_helper"
-
-RSpec.describe ProjectStatusesController, type: :routing do
-  describe "routing" do
-    it "routes to #index" do
-      expect(get: "/project_statuses").to route_to("project_statuses#index")
-    end
-
-    it "routes to #new" do
-      expect(get: "/project_statuses/new").to route_to("project_statuses#new")
-    end
-
-    it "routes to #show" do
-      expect(get: "/project_statuses/1").to route_to("project_statuses#show", id: "1")
-    end
-
-    it "routes to #edit" do
-      expect(get: "/project_statuses/1/edit").to route_to("project_statuses#edit", id: "1")
-    end
-
-
-    it "routes to #create" do
-      expect(post: "/project_statuses").to route_to("project_statuses#create")
-    end
-
-    it "routes to #update via PUT" do
-      expect(put: "/project_statuses/1").to route_to("project_statuses#update", id: "1")
-    end
-
-    it "routes to #update via PATCH" do
-      expect(patch: "/project_statuses/1").to route_to("project_statuses#update", id: "1")
-    end
-
-    it "routes to #destroy" do
-      expect(delete: "/project_statuses/1").to route_to("project_statuses#destroy", id: "1")
-    end
-  end
-end
diff --git a/spec/routing/projects_routing_spec.rb b/spec/routing/projects_routing_spec.rb
deleted file mode 100644
index 19b9fe1cb..000000000
--- a/spec/routing/projects_routing_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require "rails_helper"
-
-RSpec.describe ProjectsController, type: :routing do
-  describe "routing" do
-    it "routes to #index" do
-      expect(get: "/projects").to route_to("projects#index")
-    end
-
-    it "routes to #new" do
-      expect(get: "/projects/new").to route_to("projects#new")
-    end
-
-    it "routes to #show" do
-      expect(get: "/projects/1").to route_to("projects#show", id: "1")
-    end
-
-    it "routes to #edit" do
-      expect(get: "/projects/1/edit").to route_to("projects#edit", id: "1")
-    end
-
-
-    it "routes to #create" do
-      expect(post: "/projects").to route_to("projects#create")
-    end
-
-    it "routes to #update via PUT" do
-      expect(put: "/projects/1").to route_to("projects#update", id: "1")
-    end
-
-    it "routes to #update via PATCH" do
-      expect(patch: "/projects/1").to route_to("projects#update", id: "1")
-    end
-
-    it "routes to #destroy" do
-      expect(delete: "/projects/1").to route_to("projects#destroy", id: "1")
-    end
-  end
-end
diff --git a/spec/views/community_news/edit.html.erb_spec.rb b/spec/views/community_news/edit.html.erb_spec.rb
index e93837b23..01db97ecd 100644
--- a/spec/views/community_news/edit.html.erb_spec.rb
+++ b/spec/views/community_news/edit.html.erb_spec.rb
@@ -12,7 +12,7 @@
       featured: false,
       author: create(:user),
       reference_url: "MyString",
-      project: nil,
+      organization: nil,
       windows_type: nil,
       created_by: create(:user),
       updated_by: create(:user),
@@ -45,7 +45,7 @@
 
       assert_select "textarea[name=?]", "community_news[reference_url]"
 
-      assert_select "select[name=?]", "community_news[project_id]"
+      assert_select "select[name=?]", "community_news[organization_id]"
 
       assert_select "select[name=?]", "community_news[windows_type_id]"
     end
diff --git a/spec/views/community_news/index.html.erb_spec.rb b/spec/views/community_news/index.html.erb_spec.rb
index 01b0cf069..f2f9c3e4f 100644
--- a/spec/views/community_news/index.html.erb_spec.rb
+++ b/spec/views/community_news/index.html.erb_spec.rb
@@ -11,7 +11,7 @@
     featured: false,
     author: create(:user),
     reference_url: "Reference Url",
-    project: nil,
+    organization: nil,
     windows_type: nil,
     created_by: create(:user),
     updated_by: create(:user),
@@ -24,7 +24,7 @@
     featured: false,
     author: create(:user),
     reference_url: "Reference Url",
-    project: nil,
+    organization: nil,
     windows_type: nil,
     created_by: create(:user),
     updated_by: create(:user),
diff --git a/spec/views/community_news/new.html.erb_spec.rb b/spec/views/community_news/new.html.erb_spec.rb
index aa64a158e..c98c80a7e 100644
--- a/spec/views/community_news/new.html.erb_spec.rb
+++ b/spec/views/community_news/new.html.erb_spec.rb
@@ -17,7 +17,7 @@
       featured: false,
       author: create(:user),
       reference_url: "MyString",
-      project: nil,
+      organization: nil,
       windows_type: nil,
       created_by: create(:user),
       updated_by: create(:user),
@@ -42,7 +42,7 @@
 
       assert_select "textarea[name=?]", "community_news[reference_url]"
 
-      assert_select "select[name=?]", "community_news[project_id]"
+      assert_select "select[name=?]", "community_news[organization_id]"
 
       assert_select "select[name=?]", "community_news[windows_type_id]"
     end
diff --git a/spec/views/community_news/show.html.erb_spec.rb b/spec/views/community_news/show.html.erb_spec.rb
index 6606159fd..4986bf681 100644
--- a/spec/views/community_news/show.html.erb_spec.rb
+++ b/spec/views/community_news/show.html.erb_spec.rb
@@ -16,7 +16,7 @@
       featured: false,
       author: create(:user),
       reference_url: "Reference Url",
-      project: nil,
+      organization: nil,
       windows_type: nil,
       created_by: create(:user),
       updated_by: create(:user),
diff --git a/spec/views/organization_statuses/edit.html.erb_spec.rb b/spec/views/organization_statuses/edit.html.erb_spec.rb
new file mode 100644
index 000000000..e84b53e81
--- /dev/null
+++ b/spec/views/organization_statuses/edit.html.erb_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+RSpec.describe "organization_statuses/edit", type: :view do
+  let(:admin) { create(:user, :admin) }
+  let(:organization_status) { create(:organization_status) }
+
+  before(:each) do
+    sign_in admin
+    assign(:organization_status, organization_status)
+  end
+
+  it "renders the edit organization_status form" do
+    render
+
+    assert_select "form[action=?][method=?]", organization_status_path(organization_status), "post" do
+      assert_select "input[name=?]", "organization_status[name]"
+    end
+  end
+end
diff --git a/spec/views/organization_statuses/index.html.erb_spec.rb b/spec/views/organization_statuses/index.html.erb_spec.rb
new file mode 100644
index 000000000..a9865031f
--- /dev/null
+++ b/spec/views/organization_statuses/index.html.erb_spec.rb
@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+RSpec.describe "organization_statuses/index", type: :view do
+  let(:admin) { create(:user, :admin) }
+  let(:organization_status1) { create(:organization_status, name: "Active") }
+  let(:organization_status2) { create(:organization_status, name: "Suspended") }
+
+  before(:each) do
+    assign(:organization_statuses, paginated([ organization_status1, organization_status2 ]))
+    allow(view).to receive(:current_user).and_return(admin)
+  end
+
+  it "renders a list of organization_statuses" do
+    render
+    expect(rendered).to include(organization_status1.name, organization_status2.name)
+  end
+
+  it "renders a friendly message when no organization_statuses exist" do
+    assign(:organization_statuses, paginated([]))
+    render
+    expect(rendered).to match(/No organization statuses found/)
+  end
+end
diff --git a/spec/views/organization_statuses/new.html.erb_spec.rb b/spec/views/organization_statuses/new.html.erb_spec.rb
new file mode 100644
index 000000000..28c674179
--- /dev/null
+++ b/spec/views/organization_statuses/new.html.erb_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+RSpec.describe "organization_statuses/new", type: :view do
+  let(:admin) { create(:user, :admin) }
+  let(:organization_status) { build(:organization_status) }
+
+  before do
+    allow(view).to receive(:current_user).and_return(admin)
+    assign(:organization_status, organization_status)
+  end
+
+  it "renders new organization_status form" do
+    render
+
+    assert_select "form[action=?]", organization_statuses_path do
+      assert_select "input[name=?]", "organization_status[name]"
+    end
+  end
+end
diff --git a/spec/views/project_statuses/show.html.erb_spec.rb b/spec/views/organization_statuses/show.html.erb_spec.rb
similarity index 56%
rename from spec/views/project_statuses/show.html.erb_spec.rb
rename to spec/views/organization_statuses/show.html.erb_spec.rb
index c898a21a7..696c646a6 100644
--- a/spec/views/project_statuses/show.html.erb_spec.rb
+++ b/spec/views/organization_statuses/show.html.erb_spec.rb
@@ -1,11 +1,11 @@
 require 'rails_helper'
 
-RSpec.describe "project_statuses/show", type: :view do
+RSpec.describe "organization_statuses/show", type: :view do
   let(:admin) { create(:user, :admin) }
-  let(:project_status) { create(:project_status, name: "Name") }
+  let(:organization_status) { create(:organization_status, name: "Name") }
 
   before(:each) do
-    assign(:project_status, project_status)
+    assign(:organization_status, organization_status)
     allow(view).to receive(:current_user).and_return(admin)
   end
 
diff --git a/spec/views/organizations/edit.html.erb_spec.rb b/spec/views/organizations/edit.html.erb_spec.rb
new file mode 100644
index 000000000..2f22862e4
--- /dev/null
+++ b/spec/views/organizations/edit.html.erb_spec.rb
@@ -0,0 +1,43 @@
+require 'rails_helper'
+
+RSpec.describe "organizations/edit", type: :view do
+  let(:user) { create(:user) }
+  let(:admin) { create(:user, :admin) }
+
+  let(:organization_status) { create(:organization_status) }
+  let(:windows_type) { create(:windows_type) }
+
+  let(:organization) {
+    Organization.create!(
+      windows_type: windows_type,
+      organization_status: organization_status,
+      location: nil,
+      name: "MyString",
+      description: "MyString",
+      inactive: false,
+      notes: "MyText"
+    )
+  }
+
+  before(:each) do
+    assign(:organization, organization)
+    allow(view).to receive(:current_user).and_return(admin)
+    render
+  end
+
+  it "renders the edit organization form" do
+    assert_select "form[action=?][method=?]", organization_path(organization), "post" do
+      assert_select "select[name=?]", "organization[windows_type_id]"
+
+      assert_select "textarea[name=?]", "organization[name]"
+
+      assert_select "textarea[name=?]", "organization[description]"
+
+      assert_select "select[name=?]", "organization[organization_status_id]"
+
+      assert_select "input[name=?]", "organization[inactive]"
+
+      assert_select "textarea[name=?]", "organization[notes]"
+    end
+  end
+end
diff --git a/spec/views/organizations/index.html.erb_spec.rb b/spec/views/organizations/index.html.erb_spec.rb
new file mode 100644
index 000000000..654a53f64
--- /dev/null
+++ b/spec/views/organizations/index.html.erb_spec.rb
@@ -0,0 +1,25 @@
+require "rails_helper"
+
+RSpec.describe "organizations/index", type: :view do
+  let(:user) { create(:user) }
+  let(:admin) { create(:user, :admin) }
+
+  let!(:organization1) { create(:organization, name: "Organization 1") }
+  let!(:organization2) { create(:organization, name: "Organization 2") }
+
+  let!(:organization_status1) { create(:organization_status, name: "Active") }
+  let!(:organization_status2) { create(:organization_status, name: "Suspended") }
+  let!(:organization_status3) { create(:organization_status, name: "Inactive") }
+
+  before(:each) do
+    assign(:organizations, paginated([ organization1, organization2 ]))
+    assign(:organization_statuses, [ organization_status1, organization_status2, organization_status3 ])
+    allow(view).to receive(:current_user).and_return(user)
+    render
+  end
+
+  it "renders a list of organizations" do
+    expect(rendered).to match(organization1.name)
+    expect(rendered).to match(organization2.name)
+  end
+end
diff --git a/spec/views/organizations/new.html.erb_spec.rb b/spec/views/organizations/new.html.erb_spec.rb
new file mode 100644
index 000000000..9b76f5321
--- /dev/null
+++ b/spec/views/organizations/new.html.erb_spec.rb
@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+RSpec.describe "organizations/new", type: :view do
+  let(:user) { create(:user) }
+  let(:admin) { create(:user, :admin) }
+
+  before do
+    assign(:organization, Organization.new)
+    allow(view).to receive(:current_user).and_return(admin)
+    render
+  end
+
+  it "renders new organization form" do
+    assert_select "form[action=?][method=?]", organizations_path, "post" do
+      assert_select "select[name=?]", "organization[windows_type_id]"
+
+      assert_select "textarea[name=?]", "organization[name]"
+
+      assert_select "textarea[name=?]", "organization[description]"
+
+      assert_select "select[name=?]", "organization[organization_status_id]"
+
+      assert_select "input[name=?]", "organization[inactive]"
+
+      assert_select "textarea[name=?]", "organization[notes]"
+    end
+  end
+end
diff --git a/spec/views/projects/show.html.erb_spec.rb b/spec/views/organizations/show.html.erb_spec.rb
similarity index 51%
rename from spec/views/projects/show.html.erb_spec.rb
rename to spec/views/organizations/show.html.erb_spec.rb
index 734f53245..89141f1fa 100644
--- a/spec/views/projects/show.html.erb_spec.rb
+++ b/spec/views/organizations/show.html.erb_spec.rb
@@ -1,18 +1,18 @@
 require "rails_helper"
 
-RSpec.describe "projects/show", type: :view do
+RSpec.describe "organizations/show", type: :view do
   let(:user) { create(:user) }
   let(:admin) { create(:user, :admin) }
 
-  let!(:project) { create(:project, name: "Project 1") }
+  let!(:organization) { create(:organization, name: "Organization 1") }
 
   before do
-    assign(:project, project)
+    assign(:organization, organization)
     allow(view).to receive(:current_user).and_return(user)
     render
   end
 
   it "renders attributes" do
-    expect(rendered).to match(project.name)
+    expect(rendered).to match(organization.name)
   end
 end
diff --git a/spec/views/project_statuses/edit.html.erb_spec.rb b/spec/views/project_statuses/edit.html.erb_spec.rb
deleted file mode 100644
index bd170cfc8..000000000
--- a/spec/views/project_statuses/edit.html.erb_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "project_statuses/edit", type: :view do
-  let(:admin) { create(:user, :admin) }
-  let(:project_status) { create(:project_status) }
-
-  before(:each) do
-    sign_in admin
-    assign(:project_status, project_status)
-  end
-
-  it "renders the edit project_status form" do
-    render
-
-    assert_select "form[action=?][method=?]", project_status_path(project_status), "post" do
-      assert_select "input[name=?]", "project_status[name]"
-    end
-  end
-end
diff --git a/spec/views/project_statuses/index.html.erb_spec.rb b/spec/views/project_statuses/index.html.erb_spec.rb
deleted file mode 100644
index 5b08f3e94..000000000
--- a/spec/views/project_statuses/index.html.erb_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "project_statuses/index", type: :view do
-  let(:admin) { create(:user, :admin) }
-  let(:project_status1) { create(:project_status, name: "Active") }
-  let(:project_status2) { create(:project_status, name: "Suspended") }
-
-  before(:each) do
-    assign(:project_statuses, paginated([ project_status1, project_status2 ]))
-    allow(view).to receive(:current_user).and_return(admin)
-  end
-
-  it "renders a list of project_statuses" do
-    render
-    expect(rendered).to include(project_status1.name, project_status2.name)
-  end
-
-  it "renders a friendly message when no project_statuses exist" do
-    assign(:project_statuses, paginated([]))
-    render
-    expect(rendered).to match(/No project statuses found/)
-  end
-end
diff --git a/spec/views/project_statuses/new.html.erb_spec.rb b/spec/views/project_statuses/new.html.erb_spec.rb
deleted file mode 100644
index d8c52a904..000000000
--- a/spec/views/project_statuses/new.html.erb_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "project_statuses/new", type: :view do
-  let(:admin) { create(:user, :admin) }
-  let(:project_status) { build(:project_status) }
-
-  before do
-    allow(view).to receive(:current_user).and_return(admin)
-    assign(:project_status, project_status)
-  end
-
-  it "renders new project_status form" do
-    render
-
-    assert_select "form[action=?]", project_statuses_path do
-      assert_select "input[name=?]", "project_status[name]"
-    end
-  end
-end
diff --git a/spec/views/projects/edit.html.erb_spec.rb b/spec/views/projects/edit.html.erb_spec.rb
deleted file mode 100644
index 720c78192..000000000
--- a/spec/views/projects/edit.html.erb_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "projects/edit", type: :view do
-  let(:user) { create(:user) }
-  let(:admin) { create(:user, :admin) }
-
-  let(:project_status) { create(:project_status) }
-  let(:windows_type) { create(:windows_type) }
-
-  let(:project) {
-    Project.create!(
-      windows_type: windows_type,
-      project_status: project_status,
-      location: nil,
-      name: "MyString",
-      description: "MyString",
-      inactive: false,
-      notes: "MyText"
-    )
-  }
-
-  before(:each) do
-    assign(:project, project)
-    allow(view).to receive(:current_user).and_return(admin)
-    render
-  end
-
-  it "renders the edit project form" do
-    assert_select "form[action=?][method=?]", project_path(project), "post" do
-      assert_select "select[name=?]", "project[windows_type_id]"
-
-      assert_select "textarea[name=?]", "project[name]"
-
-      assert_select "textarea[name=?]", "project[description]"
-
-      assert_select "select[name=?]", "project[project_status_id]"
-
-      assert_select "input[name=?]", "project[inactive]"
-
-      assert_select "textarea[name=?]", "project[notes]"
-    end
-  end
-end
diff --git a/spec/views/projects/index.html.erb_spec.rb b/spec/views/projects/index.html.erb_spec.rb
deleted file mode 100644
index 7c9ec23a9..000000000
--- a/spec/views/projects/index.html.erb_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "projects/index", type: :view do
-  let(:user) { create(:user) }
-  let(:admin) { create(:user, :admin) }
-
-  let!(:project1) { create(:project, name: "Project 1") }
-  let!(:project2) { create(:project, name: "Project 2") }
-
-  let!(:project_status1) { create(:project_status, name: "Active") }
-  let!(:project_status2) { create(:project_status, name: "Suspended") }
-  let!(:project_status3) { create(:project_status, name: "Inactive") }
-
-  before(:each) do
-    assign(:projects, paginated([ project1, project2 ]))
-    assign(:project_statuses, [ project_status1, project_status2, project_status3 ])
-    allow(view).to receive(:current_user).and_return(user)
-    render
-  end
-
-  it "renders a list of projects" do
-    expect(rendered).to match(project1.name)
-    expect(rendered).to match(project2.name)
-  end
-end
diff --git a/spec/views/projects/new.html.erb_spec.rb b/spec/views/projects/new.html.erb_spec.rb
deleted file mode 100644
index f9baf4ab8..000000000
--- a/spec/views/projects/new.html.erb_spec.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "projects/new", type: :view do
-  let(:user) { create(:user) }
-  let(:admin) { create(:user, :admin) }
-
-  before do
-    assign(:project, Project.new)
-    allow(view).to receive(:current_user).and_return(admin)
-    render
-  end
-
-  it "renders new project form" do
-    assert_select "form[action=?][method=?]", projects_path, "post" do
-      assert_select "select[name=?]", "project[windows_type_id]"
-
-      assert_select "textarea[name=?]", "project[name]"
-
-      assert_select "textarea[name=?]", "project[description]"
-
-      assert_select "select[name=?]", "project[project_status_id]"
-
-      assert_select "input[name=?]", "project[inactive]"
-
-      assert_select "textarea[name=?]", "project[notes]"
-    end
-  end
-end
diff --git a/spec/views/stories/edit.html.erb_spec.rb b/spec/views/stories/edit.html.erb_spec.rb
index de070f318..61262714f 100644
--- a/spec/views/stories/edit.html.erb_spec.rb
+++ b/spec/views/stories/edit.html.erb_spec.rb
@@ -8,7 +8,7 @@
     assign(:story, story.decorate)
     assign(:windows_types, [])
     assign(:workshops, [])
-    assign(:projects, [])
+    assign(:organizations, [])
     assign(:users, [])
     allow(view).to receive(:current_user).and_return(user)
   end
@@ -19,7 +19,7 @@
     assert_select "form[action=?][method=?]", story_path(story), "post" do
       assert_select "select[name=?]", "story[windows_type_id]"
 
-      assert_select "select[name=?]", "story[project_id]"
+      assert_select "select[name=?]", "story[organization_id]"
 
       assert_select "select[name=?]", "story[workshop_id]"
 
diff --git a/spec/views/stories/new.html.erb_spec.rb b/spec/views/stories/new.html.erb_spec.rb
index 9364fa69d..3c22da7d5 100644
--- a/spec/views/stories/new.html.erb_spec.rb
+++ b/spec/views/stories/new.html.erb_spec.rb
@@ -7,7 +7,7 @@
     assign(:story, Story.new)
     assign(:windows_types, [])
     assign(:workshops, [])
-    assign(:projects, [])
+    assign(:organizations, [])
     assign(:users, [])
     allow(view).to receive(:current_user).and_return(user)
   end
@@ -18,7 +18,7 @@
     assert_select "form[action=?][method=?]", stories_path, "post" do
       assert_select "select[name=?]", "story[windows_type_id]"
 
-      assert_select "select[name=?]", "story[project_id]"
+      assert_select "select[name=?]", "story[organization_id]"
 
       assert_select "select[name=?]", "story[workshop_id]"
 
diff --git a/spec/views/stories/show.html.erb_spec.rb b/spec/views/stories/show.html.erb_spec.rb
index b3a75c0a3..b38531c81 100644
--- a/spec/views/stories/show.html.erb_spec.rb
+++ b/spec/views/stories/show.html.erb_spec.rb
@@ -13,7 +13,7 @@
 
   it "renders attributes in <p>" do
     render
-    expect(rendered).to match(story.project.name)
+    expect(rendered).to match(story.organization.name)
     expect(rendered).to match(story.workshop.name)
     expect(rendered).to match(/MyBody/)
     expect(rendered).to match(user.full_name)
diff --git a/spec/views/stories/show_with_story_idea.html.erb_spec.rb b/spec/views/stories/show_with_story_idea.html.erb_spec.rb
index 2b7fb3eec..4c9ccee2c 100644
--- a/spec/views/stories/show_with_story_idea.html.erb_spec.rb
+++ b/spec/views/stories/show_with_story_idea.html.erb_spec.rb
@@ -15,7 +15,7 @@
 
   it "renders attributes in <p>" do
     render
-    expect(rendered).to match(story_idea.project.name)
+    expect(rendered).to match(story_idea.organization.name)
     expect(rendered).to match(story_idea.workshop.name)
     expect(rendered).to match(/MyBody/)
     expect(rendered).to match(story_idea.created_by.full_name)
diff --git a/spec/views/story_ideas/edit.html.erb_spec.rb b/spec/views/story_ideas/edit.html.erb_spec.rb
index 8b5bb3c08..907cfc2f3 100644
--- a/spec/views/story_ideas/edit.html.erb_spec.rb
+++ b/spec/views/story_ideas/edit.html.erb_spec.rb
@@ -9,7 +9,7 @@
     assign(:story_idea, story_idea)
     assign(:windows_types, [])
     assign(:workshops, [])
-    assign(:projects, [])
+    assign(:organizations, [])
     assign(:users, [])
     allow(view).to receive(:current_user).and_return(user)
     render
@@ -19,7 +19,7 @@
     it "renders the edit story_idea form without created_by_id field" do
       assert_select "form[action=?][method=?]", story_idea_path(story_idea), "post" do
         assert_select "select[name=?]", "story_idea[windows_type_id]"
-        assert_select "select[name=?]", "story_idea[project_id]"
+        assert_select "select[name=?]", "story_idea[organization_id]"
         assert_select "select[name=?]", "story_idea[workshop_id]"
         assert_select "textarea[name=?]", "story_idea[body]"
         assert_select "textarea[name=?]", "story_idea[youtube_url]"
diff --git a/spec/views/story_ideas/new.html.erb_spec.rb b/spec/views/story_ideas/new.html.erb_spec.rb
index 329d84514..3fa7689d2 100644
--- a/spec/views/story_ideas/new.html.erb_spec.rb
+++ b/spec/views/story_ideas/new.html.erb_spec.rb
@@ -8,7 +8,7 @@
     assign(:story_idea, StoryIdea.new)
     assign(:windows_types, [])
     assign(:workshops, [])
-    assign(:projects, [])
+    assign(:organizations, [])
     assign(:users, [])
   end
 
@@ -22,7 +22,7 @@
 
       assert_select "form[action=?][method=?]", story_ideas_path, "post" do
         assert_select "select[name=?]", "story_idea[windows_type_id]"
-        assert_select "select[name=?]", "story_idea[project_id]"
+        assert_select "select[name=?]", "story_idea[organization_id]"
         assert_select "select[name=?]", "story_idea[workshop_id]"
         assert_select "textarea[name=?]", "story_idea[body]"
         assert_select "textarea[name=?]", "story_idea[youtube_url]"
diff --git a/spec/views/story_ideas/show.html.erb_spec.rb b/spec/views/story_ideas/show.html.erb_spec.rb
index 04acdb3c6..a7c54a600 100644
--- a/spec/views/story_ideas/show.html.erb_spec.rb
+++ b/spec/views/story_ideas/show.html.erb_spec.rb
@@ -10,7 +10,7 @@
 
   it "renders attributes in <p>" do
     render
-    expect(rendered).to match(story_idea.project.name)
+    expect(rendered).to match(story_idea.organization.name)
     expect(rendered).to match(story_idea.workshop.name)
     expect(rendered).to match(/MyBody/)
     expect(rendered).to match(user.full_name)
diff --git a/spec/views/users/show.html.erb_spec.rb b/spec/views/users/show.html.erb_spec.rb
index aa1fd0a55..542e32db5 100644
--- a/spec/views/users/show.html.erb_spec.rb
+++ b/spec/views/users/show.html.erb_spec.rb
@@ -15,8 +15,8 @@
   let(:windows_type) { create(:windows_type, name: "Adult Windows") }
   let!(:workshop) { create(:workshop, title: "Mindful Art", user: user, windows_type: windows_type) }
 
-  let!(:project) { create(:project, name: "Healing Arts") }
-  let!(:project_user) { create(:project_user, project: project, user: user, position: :leader) }
+  let!(:project) { create(:organization, name: "Healing Arts") }
+  let!(:project_user) { create(:organization_user, organization: project, user: user, position: :leader) }
 
   before do
     assign(:user, user)

From bb1d6866436ec6038f3e0830092908cb2eb04ad8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 20 Jan 2026 01:19:20 +0000
Subject: [PATCH 5/5] Changes before error encountered

Co-authored-by: maebeale <7607813+maebeale@users.noreply.github.com>
---
 app/controllers/monthly_reports_controller.rb | 18 +++++++-------
 app/controllers/reports_controller.rb         | 12 +++++-----
 app/controllers/workshop_logs_controller.rb   | 24 +++++++++----------
 app/models/user.rb                            | 12 +++++-----
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/app/controllers/monthly_reports_controller.rb b/app/controllers/monthly_reports_controller.rb
index 57fee3514..44409c647 100644
--- a/app/controllers/monthly_reports_controller.rb
+++ b/app/controllers/monthly_reports_controller.rb
@@ -38,7 +38,7 @@ def create
         @form_builder = FormBuilder.find(@report.owner_id)
         build_month_and_year
         load_agencies
-        @agency_id = report_params["project_id"]
+        @agency_id = report_params["organization_id"]
 
         flash[:alert] = "There was a problem submitting your form: " +
                         "#{@report.errors.full_messages.join(" ")}"
@@ -61,7 +61,7 @@ def edit
     build_month_and_year
     find_form_builder
     @report = Report.find(params[:id])
-    @agencies  = current_user.projects.
+    @agencies  = current_user.organizations.
                  where(windows_type_id: @report.windows_type_id)
     @month = @report.date.month
     @year  =  @report.date.year
@@ -85,7 +85,7 @@ def update
         flash[:notice] = "Thanks for reporting on a update report. "
         redirect_to authenticated_root_path
       else
-        @agencies  = current_user.projects.
+        @agencies  = current_user.organizations.
                        where(windows_type_id: @report.windows_type_id)
 
         flash[:alert] = "ERROR!!!!!!!!!!!!!!"
@@ -102,7 +102,7 @@ def show
     @answers      = @monthly_report.report_form_field_answers
 
     if @monthly_report
-      if current_user.super_user? || (@monthly_report.project && current_user.project_ids.include?(@monthly_report.project.id))
+      if current_user.super_user? || (@monthly_report.organization && current_user.organization_ids.include?(@monthly_report.organization.id))
         render :show
       else
         redirect_to authenticated_root_path, error: "You do not have permission to view this page."
@@ -116,7 +116,7 @@ def show
   private
 
   def load_agencies
-    @agencies  = current_user.projects.
+    @agencies  = current_user.organizations.
                    where(windows_type_id: @form_builder.windows_type_id).uniq
   end
 
@@ -143,7 +143,7 @@ def find_form_builder
         .decorate
     end
 
-    agency     = params[:agency_id] ? Project.find(params[:agency_id]) : current_user.projects.where(windows_type_id: @form_builder.windows_type).first
+    agency     = params[:agency_id] ? Organization.find(params[:agency_id]) : current_user.organizations.where(windows_type_id: @form_builder.windows_type).first
     @agency_id = agency.id unless agency.nil?
   end
 
@@ -196,7 +196,7 @@ def build_report_form_fields
   end
 
   def find_workshop_logs
-    @workshop_logs = current_user.project_monthly_workshop_logs(
+    @workshop_logs = current_user.organization_monthly_workshop_logs(
       @report.date, @report.windows_type
     )
 
@@ -207,7 +207,7 @@ def find_workshop_logs
 
   def find_combined_workshop_logs(agency_id)
     combined_windows_type = WindowsType.where(short_name: "COMBINED").first
-    @combined_workshop_logs = current_user.project_workshop_logs(
+    @combined_workshop_logs = current_user.organization_workshop_logs(
     @report.date, combined_windows_type, agency_id)
   end
 
@@ -225,7 +225,7 @@ def report_params
     end
 
     params.require(:report).permit(
-      :type, :project_id, :date, :owner_id, :workshop_id,
+      :type, :organization_id, :date, :owner_id, :workshop_id,
       :owner_type, :windows_type_id, :other_description,
       media_files_attributes: [ :file ],
       report_form_field_answers_attributes:
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 85ff49c33..f8a86b9a9 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -27,7 +27,7 @@ def share_story
 
     @report.owner_type = "FormBuilder"
     @report.owner_id   = 7
-    @agencies = current_user.projects
+    @agencies = current_user.organizations
   end
 
   def render_form
@@ -46,7 +46,7 @@ def edit
     build_month_and_year
     find_form_builder
     @report    = current_user.submitted_monthly_report(@date, @form_builder.windows_type)
-    @agencies  = current_user.projects.
+    @agencies  = current_user.organizations.
                  where(windows_type_id: @report.windows_type_id)
     @month = @report.date.month
     @year  =  @report.date.year
@@ -60,7 +60,7 @@ def edit_story
                              .order(title: :asc)
 
     @report    = Report.find(params[:id])
-    @agencies  = current_user.projects.
+    @agencies  = current_user.organizations.
                  where(windows_type_id: @report.windows_type_id)
   end
 
@@ -159,7 +159,7 @@ def create_story
       @report.windows_type_id = Workshop.find(@report.workshop_id).windows_type_id
     else
       @report.workshop_id = nil
-      @report.windows_type_id = @report.project.windows_type_id
+      @report.windows_type_id = @report.organization.windows_type_id
     end
 
     if @report.save
@@ -233,7 +233,7 @@ def build_report_form_fields
   end
 
   def find_workshop_logs
-    @workshop_logs = current_user.project_monthly_workshop_logs(
+    @workshop_logs = current_user.organization_monthly_workshop_logs(
       @report.date, @report.windows_type
     )
 
@@ -256,7 +256,7 @@ def report_params
     end
 
     params.require(:report).permit(
-      :image, :form_file, :type, :project_id, :date, :workshop_name, :owner_id, :workshop_id,
+      :image, :form_file, :type, :organization_id, :date, :workshop_name, :owner_id, :workshop_id,
       :owner_type, :windows_type_id, report_form_field_answers_attributes:
       [ :form_field_id, :answer_option_id, :answer, :_create ],
       media_files_attributes: [ :file ],
diff --git a/app/controllers/workshop_logs_controller.rb b/app/controllers/workshop_logs_controller.rb
index 86ad3e703..83d17b4c9 100644
--- a/app/controllers/workshop_logs_controller.rb
+++ b/app/controllers/workshop_logs_controller.rb
@@ -9,7 +9,7 @@ def index
         WorkshopLog.all
       else
         WorkshopLog.where(created_by_id: current_user.id)
-                   .or(WorkshopLog.project_id(current_user.project_ids))
+                   .or(WorkshopLog.organization_id(current_user.organization_ids))
       end
     @workshop_logs_unpaginated = permitted_logs.includes(:workshop, :user, :windows_type)
                                                .search(params)
@@ -83,7 +83,7 @@ def show
     @answers      = @workshop_log.report_form_field_answers
 
     if @workshop_log
-      if current_user.super_user? || (@workshop_log.project && current_user.project_ids.include?(@workshop_log.project.id))
+      if current_user.super_user? || (@workshop_log.organization && current_user.organization_ids.include?(@workshop_log.organization.id))
         render :show
       else
         redirect_to authenticated_root_path, error: "You do not have permission to view this page."
@@ -104,7 +104,7 @@ def edit
   def validate_new
     @date         = Date.new(params[:year].to_i, params[:month].to_i)
     @windows_type = WindowsType.find(params[:windows_type])
-    @report       = current_user.submitted_monthly_report(@date, @windows_type, params[:project_id])
+    @report       = current_user.submitted_monthly_report(@date, @windows_type, params[:organization_id])
 
     render json: { validate: @report.nil? }.to_json
   end
@@ -124,10 +124,10 @@ def set_index_variables # needs to not be private
                         .distinct
                         .order(:last_name, :first_name)
     @projects = if current_user.super_user?
-      # Project.where(id: @workshop_logs_unpaginated.pluck(:project_id)).order(:name)
-      Project.active.order(:name)
+      # Organization.where(id: @workshop_logs_unpaginated.pluck(:organization_id)).order(:name)
+      Organization.active.order(:name)
     else
-      current_user.projects.order(:name)
+      current_user.organizations.order(:name)
     end
     # @workshops = Workshop.joins(:workshop_logs)
     #                      .order(:title)
@@ -181,11 +181,11 @@ def set_form_variables
     end
 
     @agencies =
-      Project.where(id: current_user.projects.select(:id))
-             .or(Project.where(id: @workshop_log.project_id))
-             .distinct
-             .order(:name)
-    agency = params[:agency_id].present? ? Project.where(id: params[:agency_id]).last : @agencies.first
+      Organization.where(id: current_user.organizations.select(:id))
+                   .or(Organization.where(id: @workshop_log.organization_id))
+                   .distinct
+                   .order(:name)
+    agency = params[:agency_id].present? ? Organization.where(id: params[:agency_id]).last : @agencies.first
     @agency_id = agency.id if agency
   end
 
@@ -209,7 +209,7 @@ def set_workshop
   def workshop_log_params
     params.require(:workshop_log).permit(
       :children_ongoing, :children_first_time, :teens_ongoing, :teens_first_time,
-      :adults_ongoing, :adults_first_time, :owner_id, :owner_type, :user_id, :project_id, :date,
+      :adults_ongoing, :adults_first_time, :owner_id, :owner_type, :user_id, :organization_id, :date,
       :workshop_name, :workshop_id, :windows_type_id, :other_description, # :user,
       quotable_item_quotes_attributes: [
         :id, :quotable_type, :quotable_id, :_destroy,
diff --git a/app/models/user.rb b/app/models/user.rb
index 2ea550354..706d72f96 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -116,11 +116,11 @@ def recent_activity(activity_limit = 10)
     recent.sort_by { |item| item.try(:updated_at) || item.created_at }.reverse.first(activity_limit * 8)
   end
 
-  def project_monthly_workshop_logs(date, *windows_type)
+  def organization_monthly_workshop_logs(date, *windows_type)
     where = windows_type.map { |wt| "windows_type_id = ?" }
 
-    logs = projects.map do |project|
-      project.workshop_logs.where(where.join(" OR "), *windows_type)
+    logs = organizations.map do |organization|
+      organization.workshop_logs.where(where.join(" OR "), *windows_type)
     end.flatten
     logs = logs.select do |log|
       log.date && log.date.month == date.month.to_i &&
@@ -129,9 +129,9 @@ def project_monthly_workshop_logs(date, *windows_type)
     logs.uniq.group_by { |log| log.date }
   end
 
-  def project_workshop_logs(date, windows_type, project_id)
-    if project_id
-      logs = workshop_logs.where(project_id: project_id, windows_type_id: windows_type.id)
+  def organization_workshop_logs(date, windows_type, organization_id)
+    if organization_id
+      logs = workshop_logs.where(organization_id: organization_id, windows_type_id: windows_type.id)
       logs = logs.select do |log|
         log.date && log.date.month == date.month.to_i &&
           log.date.year == date.year.to_i