diff --git a/app/assets/javascripts/lib/pulltorefresh.js b/app/assets/javascripts/lib/pulltorefresh.js
index e79ecdd10..e6fe9f0bd 100644
--- a/app/assets/javascripts/lib/pulltorefresh.js
+++ b/app/assets/javascripts/lib/pulltorefresh.js
@@ -41,7 +41,7 @@
     onRefresh: () => {
       return window.location.reload();
     },
-    resistanceFunction: t => {
+    resistanceFunction: (t) => {
       return Math.min(1, t / 2.5);
     },
     shouldPullToRefresh: () => {
@@ -50,7 +50,7 @@
         (document.getElementById('articles-list') ||
           document.getElementById('user-dashboard') ||
           document.getElementById('article-body') ||
-          document.getElementById('classifieds-index-container')) &&
+          document.getElementById('listings-index-container')) &&
         !document.body.classList.contains('modal-open')
       );
     },
@@ -178,7 +178,7 @@
 
     function onTouchStart(e) {
       // here, we must pick a handler first, and then append their html/css on the DOM
-      var target = shared.handlers.filter(h => {
+      var target = shared.handlers.filter((h) => {
         return h.contains(e.target);
       })[0];
 
@@ -347,7 +347,7 @@
     var handler = {};
 
     // merge options with defaults
-    Object.keys(defaults).forEach(key => {
+    Object.keys(defaults).forEach((key) => {
       handler[key] = options[key] || defaults[key];
     });
 
@@ -358,7 +358,7 @@
         : defaults.refreshTimeout;
 
     // normalize elements
-    methods.forEach(method => {
+    methods.forEach((method) => {
       if (typeof handler[method] === 'string') {
         handler[method] = document.querySelector(handler[method]);
       }
@@ -369,7 +369,7 @@
       shared.events = setupEvents();
     }
 
-    handler.contains = target => {
+    handler.contains = (target) => {
       return handler.triggerElement.contains(target);
     };
 
@@ -395,7 +395,7 @@
         shared.events = null;
       }
 
-      shared.handlers.forEach(h => {
+      shared.handlers.forEach((h) => {
         h.destroy();
       });
     },
diff --git a/app/assets/stylesheets/classified_listings.scss b/app/assets/stylesheets/listings.scss
similarity index 94%
rename from app/assets/stylesheets/classified_listings.scss
rename to app/assets/stylesheets/listings.scss
index 8c7a3c17f..9d8aa911d 100644
--- a/app/assets/stylesheets/classified_listings.scss
+++ b/app/assets/stylesheets/listings.scss
@@ -1,12 +1,12 @@
 @import 'variables';
 @import 'mixins';
 
-.classifieds-container {
+.listings-container {
   margin: 24px 0;
   text-align: left;
   max-width: 100%;
   min-height: 100vh;
-  .classified-filters {
+  .listing-filters {
     padding: 0 16px;
     a {
       padding: 3px 16px;
@@ -23,11 +23,11 @@
         margin: 0px 4px;
       }
     }
-    .classified-filters-categories {
+    .listing-filters-categories {
       a {
         display: block;
         padding: 7px 16px;
-        &.classified-create-link {
+        &.listing-create-link {
           border: 2px solid darken($green, 14%);
           color: darken($green, 19%);
           padding: 6px 16px;
@@ -42,13 +42,13 @@
           min-width: 50px;
           text-align: center;
           padding: 3px 16px;
-          &.classified-create-link {
+          &.listing-create-link {
             padding: 2px 16px;
           }
         }
       }
     }
-    .classified-filters-tags {
+    .listing-filters-tags {
       padding: 20px 0px;
       position: relative;
       input {
@@ -69,7 +69,7 @@
           margin-right: 8px;
         }
       }
-      .classified-search-clear {
+      .listing-search-clear {
         background: $light-gray;
         border: 1px solid $light-medium-gray;
         position: absolute;
@@ -80,7 +80,7 @@
           left: 282px;
         }
       }
-      .classified-tag {
+      .listing-tag {
         font-size: 0.7em;
         color: $black;
         border-radius: 100px;
@@ -107,7 +107,7 @@
       }
     }
   }
-  .classifieds-columns {
+  .listings-columns {
     display: grid;
     grid-gap: 24px;
     padding: 0 16px;
@@ -133,13 +133,13 @@
       border-top-left-radius: 8px;
       border-top-right-radius: 8px;
     }
-    .classified-form-inner {
+    .listing-form-inner {
       padding: 0px 15px 40px;
       @media screen and (min-width: 580px) {
         padding: 0px 15px 18px;
       }
     }
-    .listings-back-button {
+    .listing-back-button {
       font-size: 0.8em;
       margin: 2px 0px 8px;
       display: block;
@@ -149,7 +149,7 @@
       color: var(--accent-brand);
       margin: 0px;
     }
-    .classified-errors {
+    .listing-errors {
       background: $red;
       color: $black;
       padding: 20px;
@@ -261,7 +261,7 @@
         font-size: 1.1em;
       }
     }
-    .classified-listings-unpublish {
+    .listings-unpublish {
       background: $red;
     }
     p {
@@ -269,7 +269,7 @@
       color: var(--card-color-tertiary);
     }
   }
-  .classifieds-load-more-button {
+  .listings-load-more-button {
     text-align: center;
 
     button {
@@ -342,7 +342,7 @@
   font-weight: bold;
 }
 
-.single-classified-listing-container {
+.single-listing-container {
   width: 100%;
   z-index: 20;
   position: fixed;
@@ -352,7 +352,7 @@
   bottom: 0px;
   margin: 12px auto 0px;
   overflow: hidden;
-  .single-classified-listing-container__inner {
+  .single-listing-container__inner {
     position: absolute;
     height: 100%;
     width: 100%;
@@ -367,17 +367,17 @@
       right: 0;
       box-sizing: border-box;
     }
-    .single-classified-listing-container__spacer {
+    .single-listing-container__spacer {
       height: 150px;
       margin-bottom: 150px;
     }
   }
-  .single-classified-listing-container__inner::-webkit-scrollbar {
+  .single-listing-container__inner::-webkit-scrollbar {
     display: none;
   }
 }
 
-.single-classified-listing {
+.single-listing {
   width: 100%;
   display: inline-block;
   border: 1px solid $light-medium-gray;
@@ -452,10 +452,10 @@
       background-color: #f1f1f1;
     }
   }
-  .single-classified-listing-body {
+  .single-listing-body {
     padding: 10px 12px;
     font-size: 15px;
-    .classified-listing-contact-cta {
+    .listing-contact-cta {
       border: 2px solid $black;
       color: $black;
       padding: 8px 10px;
@@ -466,7 +466,7 @@
       width: 80%;
     }
   }
-  .single-classified-listing-tags {
+  .single-listing-tags {
     padding: 10px 15px;
     a {
       color: var(--card-color-tertiary);
@@ -483,19 +483,19 @@
       font-weight: bold;
     }
   }
-  .single-classified-listing-author-info {
+  .single-listing-author-info {
     font-size: 0.69em;
     color: var(--card-color-tertiary);
     padding: 0px 15px 4px;
     a {
       color: var(--card-color-tertiary);
       display: inline-block;
-      &.classified-listing-edit-button {
+      &.listing-edit-button {
         margin-left: 4px;
       }
     }
   }
-  &.single-classified-listing--opened {
+  &.single-listing--opened {
     z-index: 20;
     display: block;
     position: relative;
@@ -508,13 +508,13 @@
       h3 {
         font-size: calc(20px + 0.05vw);
       }
-      .single-classified-listing-body {
+      .single-listing-body {
         font-size: calc(18px + 0.05vw);
       }
     }
   }
 }
-.single-classified-listing-info-link {
+.single-listing-info-link {
   display: block;
   width: 320px;
   max-width: 92%;
@@ -566,7 +566,7 @@ form.listings-contact-via-connect {
   }
 }
 
-.classified-listings-modal-background {
+.listings-modal-background {
   z-index: 15;
   position: fixed;
   left: 0;
diff --git a/app/assets/stylesheets/ltags/LiquidTags.scss b/app/assets/stylesheets/ltags/LiquidTags.scss
index e7794c477..1cb633022 100644
--- a/app/assets/stylesheets/ltags/LiquidTags.scss
+++ b/app/assets/stylesheets/ltags/LiquidTags.scss
@@ -11,6 +11,6 @@
 @import 'GistTag';
 @import 'GithubReadmeTag';
 @import 'PollTag';
-@import 'ClassifiedListingTag';
+@import 'ListingTag';
 @import 'StackexchangeTag';
 @import 'WikipediaTag';
diff --git a/app/assets/stylesheets/ltags/ClassifiedListingTag.scss b/app/assets/stylesheets/ltags/ListingTag.scss
similarity index 100%
rename from app/assets/stylesheets/ltags/ClassifiedListingTag.scss
rename to app/assets/stylesheets/ltags/ListingTag.scss
diff --git a/app/assets/stylesheets/minimal.scss b/app/assets/stylesheets/minimal.scss
index 0fc90decb..5f5955583 100644
--- a/app/assets/stylesheets/minimal.scss
+++ b/app/assets/stylesheets/minimal.scss
@@ -27,7 +27,7 @@
 @import 'sticky-nav';
 @import 'sidebar-data';
 @import 'video-collection';
-@import 'classified_listings';
+@import 'listings';
 @import 'credits';
 @import 'item-list';
 @import 'color-picker';
diff --git a/app/controllers/admin/classified_listing_categories_controller.rb b/app/controllers/admin/listing_categories_controller.rb
similarity index 95%
rename from app/controllers/admin/classified_listing_categories_controller.rb
rename to app/controllers/admin/listing_categories_controller.rb
index d9b3b0ecd..04164fa12 100644
--- a/app/controllers/admin/classified_listing_categories_controller.rb
+++ b/app/controllers/admin/listing_categories_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class ClassifiedListingCategoriesController < Admin::ApplicationController
+  class ListingCategoriesController < Admin::ApplicationController
     # Overwrite any of the RESTful controller actions to implement custom behavior
     # For example, you may want to send an email after a foo is updated.
     #
diff --git a/app/controllers/api/v0/classified_listings_controller.rb b/app/controllers/api/v0/listings_controller.rb
similarity index 53%
rename from app/controllers/api/v0/classified_listings_controller.rb
rename to app/controllers/api/v0/listings_controller.rb
index 6e6957ab4..aedcdd63d 100644
--- a/app/controllers/api/v0/classified_listings_controller.rb
+++ b/app/controllers/api/v0/listings_controller.rb
@@ -1,48 +1,46 @@
 module Api
   module V0
-    class ClassifiedListingsController < ApiController
+    class ListingsController < ApiController
       include Pundit
-      include ClassifiedListingsToolkit
+      include ListingsToolkit
 
       before_action :authenticate_with_api_key_or_current_user!, only: %i[create update]
       before_action :authenticate_with_api_key_or_current_user, only: %i[show]
 
-      before_action :set_classified_listing, only: %i[update]
+      before_action :set_listing, only: %i[update]
 
       before_action :set_cache_control_headers, only: %i[index show]
 
       skip_before_action :verify_authenticity_token, only: %i[create update]
 
       def index
-        @classified_listings = ClassifiedListing.published.
+        @listings = Listing.published.
           select(ATTRIBUTES_FOR_SERIALIZATION).
-          includes(:user, :organization, :taggings, :classified_listing_category)
+          includes(:user, :organization, :taggings, :listing_category)
 
         if params[:category].present?
-          category = ClassifiedListingCategory.find_by(slug: params[:category])
-          @classified_listings =
-            @classified_listings.where(classified_listing_category: category)
+          @listings = @listings.in_category(params[:category])
         end
-        @classified_listings = @classified_listings.order(bumped_at: :desc)
+        @listings = @listings.order(bumped_at: :desc)
 
         per_page = (params[:per_page] || 30).to_i
         num = [per_page, 100].min
         page = params[:page] || 1
-        @classified_listings = @classified_listings.page(page).per(num)
+        @listings = @listings.page(page).per(num)
 
-        set_surrogate_key_header ClassifiedListing.table_key, @classified_listings.map(&:record_key)
+        set_surrogate_key_header Listing.table_key, @listings.map(&:record_key)
       end
 
       def show
-        relation = ClassifiedListing.published
+        relation = Listing.published
 
         # if the user is authenticated we allow them to access
         # their own unpublished listings as well
-        relation = relation.union(@user.classified_listings) if @user
+        relation = relation.union(@user.listings) if @user
 
-        @classified_listing = relation.select(ATTRIBUTES_FOR_SERIALIZATION).find(params[:id])
+        @listing = relation.select(ATTRIBUTES_FOR_SERIALIZATION).find(params[:id])
 
-        set_surrogate_key_header @classified_listing.record_key
+        set_surrogate_key_header @listing.record_key
       end
 
       def create
@@ -53,6 +51,8 @@ module Api
         super
       end
 
+      # Note: since this is used for selecting from the DB, we need to use the
+      # actual column name for the listing category, prefixed with classified_.
       ATTRIBUTES_FOR_SERIALIZATION = %i[
         id user_id organization_id title slug body_markdown cached_tag_list
         classified_listing_category_id processed_html published
@@ -75,7 +75,7 @@ module Api
       end
 
       def process_unsuccessful_draft
-        render json: { errors: @classified_listing.errors }, status: :unprocessable_entity
+        render json: { errors: @listing.errors }, status: :unprocessable_entity
       end
 
       def process_successful_creation
@@ -83,7 +83,7 @@ module Api
       end
 
       def process_unsuccessful_creation
-        render json: { errors: @classified_listing.errors }, status: :unprocessable_entity
+        render json: { errors: @listing.errors }, status: :unprocessable_entity
       end
 
       alias process_unsuccessful_update process_unsuccessful_creation
@@ -95,6 +95,23 @@ module Api
       def process_after_unpublish
         render "show", status: :ok
       end
+
+      # Note: when doing the big listings refactoring we decided not to break
+      # this API. Since other code assumes the params will be under listing,
+      # we're copying them over.
+      def listing_params
+        params["listing"] = params["classified_listing"]
+        if (category_id = find_category_id(params.dig("listing", "category")))
+          params["listing"]["listing_category_id"] = category_id
+        end
+        super
+      end
+
+      def find_category_id(slug)
+        return if slug.blank?
+
+        ListingCategory.select(:id).find_by(slug: slug)&.id
+      end
     end
   end
 end
diff --git a/app/controllers/chat_channels_controller.rb b/app/controllers/chat_channels_controller.rb
index 1780212bf..78e7ad65c 100644
--- a/app/controllers/chat_channels_controller.rb
+++ b/app/controllers/chat_channels_controller.rb
@@ -86,7 +86,7 @@ class ChatChannelsController < ApplicationController
 
   def create_chat
     chat_recipient = User.find(params[:user_id])
-    valid_listing = ClassifiedListing.where(user_id: params[:user_id], contact_via_connect: true).limit(1)
+    valid_listing = Listing.where(user_id: params[:user_id], contact_via_connect: true).limit(1)
     authorize ChatChannel
 
     if chat_recipient.inbox_type == "open" || valid_listing.length == 1
diff --git a/app/controllers/concerns/classified_listings_toolkit.rb b/app/controllers/concerns/listings_toolkit.rb
similarity index 66%
rename from app/controllers/concerns/classified_listings_toolkit.rb
rename to app/controllers/concerns/listings_toolkit.rb
index 69268a382..5bf869b98 100644
--- a/app/controllers/concerns/classified_listings_toolkit.rb
+++ b/app/controllers/concerns/listings_toolkit.rb
@@ -1,56 +1,56 @@
-module ClassifiedListingsToolkit
+module ListingsToolkit
   extend ActiveSupport::Concern
 
   MANDATORY_FIELDS_FOR_UPDATE = %i[body_markdown title tag_list].freeze
 
   def unpublish_listing
-    @classified_listing.update(published: false)
+    @listing.update(published: false)
   end
 
   def publish_listing
-    @classified_listing.update(published: true)
+    @listing.update(published: true)
   end
 
   def update_listing_details
     # [thepracticaldev/oss] Not entirely sure what the intention behind the
     # original code was, but at least this is more compact.
     filtered_params = listing_params.reject { |_k, v| v.nil? }
-    @classified_listing.update(filtered_params)
+    @listing.update(filtered_params)
   end
 
   def bump_listing_success
-    @classified_listing.update(bumped_at: Time.current)
+    @listing.update(bumped_at: Time.current)
   end
 
   def clear_listings_cache
-    ClassifiedListings::BustCacheWorker.perform_async(@classified_listing.id)
+    Listings::BustCacheWorker.perform_async(@listing.id)
   end
 
-  def set_classified_listing
-    @classified_listing = ClassifiedListing.find(params[:id])
+  def set_listing
+    @listing = Listing.find(params[:id])
   end
 
   def create
-    @classified_listing = ClassifiedListing.new(listing_params)
+    @listing = Listing.new(listing_params)
 
     # this will 401 for now if they don't belong in the org
-    authorize @classified_listing, :authorized_organization_poster? if @classified_listing.organization_id.present?
+    authorize @listing, :authorized_organization_poster? if @listing.organization_id.present?
 
-    @classified_listing.user_id = current_user.id
-    org = Organization.find_by(id: @classified_listing.organization_id)
+    @listing.user_id = current_user.id
+    org = Organization.find_by(id: @listing.organization_id)
 
     if listing_params[:action] == "draft"
       create_draft
       return
     end
 
-    unless @classified_listing.valid?
+    unless @listing.valid?
       @credits = current_user.credits.unspent
       process_unsuccessful_creation
       return
     end
 
-    cost = @classified_listing.cost
+    cost = @listing.cost
     # we use the org's credits if available, otherwise we default to the user's
     if org&.enough_credits?(cost)
       create_listing(org, cost)
@@ -62,26 +62,26 @@ module ClassifiedListingsToolkit
   end
 
   ALLOWED_PARAMS = %i[
-    title body_markdown classified_listing_category_id tag_list
+    title body_markdown listing_category_id tag_list
     expires_at contact_via_connect location organization_id action
   ].freeze
 
   # Filter for a set of known safe params
   def listing_params
-    tags = params["classified_listing"].delete("tags")
+    tags = params["listing"].delete("tags")
     if tags.present?
-      params["classified_listing"]["tag_list"] = tags.join(", ")
+      params["listing"]["tag_list"] = tags.join(", ")
     end
-    params.require(:classified_listing).permit(ALLOWED_PARAMS)
+    params.require(:listing).permit(ALLOWED_PARAMS)
   end
 
   def create_draft
-    @classified_listing.published = false
-    if @classified_listing.save
+    @listing.published = false
+    if @listing.save
       process_successful_draft
     else
       @credits = current_user.credits.unspent
-      @classified_listing.cached_tag_list = listing_params[:tag_list]
+      @listing.cached_tag_list = listing_params[:tag_list]
       @organizations = current_user.organizations
       process_unsuccessful_draft
     end
@@ -93,18 +93,18 @@ module ClassifiedListingsToolkit
       # subtract credits
       Credits::Buyer.call(
         purchaser: purchaser,
-        purchase: @classified_listing,
+        purchase: @listing,
         cost: cost,
       )
 
       # save the listing
-      @classified_listing.bumped_at = Time.current
-      @classified_listing.published = true
+      @listing.bumped_at = Time.current
+      @listing.published = true
 
       # since we can't raise active record errors in this transaction
       # due to the fact that we need to display them in the :new view,
       # we manually rollback the transaction if there are validation errors
-      raise ActiveRecord::Rollback unless @classified_listing.save
+      raise ActiveRecord::Rollback unless @listing.save
 
       successful_transaction = true
     end
@@ -115,16 +115,16 @@ module ClassifiedListingsToolkit
       process_successful_creation
     else
       @credits = current_user.credits.unspent
-      @classified_listing.cached_tag_list = listing_params[:tag_list]
+      @listing.cached_tag_list = listing_params[:tag_list]
       @organizations = current_user.organizations
       process_unsuccessful_creation
     end
   end
 
   def update
-    authorize @classified_listing
+    authorize @listing
 
-    cost = @classified_listing.cost
+    cost = @listing.cost
 
     # NOTE: this should probably be split in three different actions: bump, unpublish, publish
     return bump_listing(cost) if listing_params[:action] == "bump"
@@ -134,7 +134,7 @@ module ClassifiedListingsToolkit
       process_after_unpublish
       return
     elsif listing_params[:action] == "publish"
-      unless @classified_listing.bumped_at?
+      unless @listing.bumped_at?
         first_publish(cost)
         return
       end
@@ -150,7 +150,7 @@ module ClassifiedListingsToolkit
   end
 
   def bump_listing(cost)
-    org = Organization.find_by(id: @classified_listing.organization_id)
+    org = Organization.find_by(id: @listing.organization_id)
 
     if org&.enough_credits?(cost)
       charge_credits_before_bump(org, cost)
@@ -165,7 +165,7 @@ module ClassifiedListingsToolkit
     ActiveRecord::Base.transaction do
       Credits::Buyer.call(
         purchaser: purchaser,
-        purchase: @classified_listing,
+        purchase: @listing,
         cost: cost,
       )
 
@@ -174,14 +174,14 @@ module ClassifiedListingsToolkit
   end
 
   def first_publish(cost)
-    available_author_credits = @classified_listing.author.credits.unspent
+    available_author_credits = @listing.author.credits.unspent
     available_user_credits = []
-    if @classified_listing.author.is_a?(Organization)
+    if @listing.author.is_a?(Organization)
       available_user_credits = current_user.credits.unspent
     end
 
     if available_author_credits.size >= cost
-      create_listing(@classified_listing.author, cost)
+      create_listing(@listing.author, cost)
     elsif available_user_credits.size >= cost
       create_listing(current_user, cost)
     else
@@ -190,7 +190,7 @@ module ClassifiedListingsToolkit
   end
 
   def listing_updatable?
-    at_least_one_param_present? && (bumped_in_last_24_hrs? || !@classified_listing.published)
+    at_least_one_param_present? && (bumped_in_last_24_hrs? || !@listing.published)
   end
 
   def at_least_one_param_present?
@@ -198,6 +198,6 @@ module ClassifiedListingsToolkit
   end
 
   def bumped_in_last_24_hrs?
-    @classified_listing.bumped_at && @classified_listing.bumped_at > 24.hours.ago
+    @listing.bumped_at && @listing.bumped_at > 24.hours.ago
   end
 end
diff --git a/app/controllers/internal/buffer_updates_controller.rb b/app/controllers/internal/buffer_updates_controller.rb
index dedfcc25c..5e946bf54 100644
--- a/app/controllers/internal/buffer_updates_controller.rb
+++ b/app/controllers/internal/buffer_updates_controller.rb
@@ -5,7 +5,7 @@ class Internal::BufferUpdatesController < Internal::ApplicationController
     fb_post = params[:fb_post]
     tweet = params[:tweet]
     listing_id = params[:listing_id]
-    listing = ClassifiedListing.find(params[:listing_id]) if listing_id.present?
+    listing = Listing.find(params[:listing_id]) if listing_id.present?
     article&.update(featured: true)
     case params[:social_channel]
     when "main_twitter"
diff --git a/app/controllers/internal/classified_listings_controller.rb b/app/controllers/internal/classified_listings_controller.rb
deleted file mode 100644
index 0a4b0bbb0..000000000
--- a/app/controllers/internal/classified_listings_controller.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-class Internal::ClassifiedListingsController < Internal::ApplicationController
-  include ClassifiedListingsToolkit
-  layout "internal"
-
-  def index
-    @classified_listings =
-      ClassifiedListing.includes(%i[user classified_listing_category]).
-        page(params[:page]).order("bumped_at DESC").per(50)
-
-    @classified_listings = @classified_listings.published unless include_unpublished?
-    @classified_listings = @classified_listings.in_category(params[:filter]) if params[:filter].present?
-  end
-
-  def edit
-    @classified_listing = ClassifiedListing.find(params[:id])
-  end
-
-  def update
-    @classified_listing = ClassifiedListing.find(params[:id])
-    handle_publish_status if listing_params[:published]
-    bump_listing(@classified_listing.cost) if listing_params[:action] == "bump"
-    update_listing_details
-    clear_listings_cache
-    flash[:success] = "Listing updated successfully"
-    redirect_to edit_internal_classified_listing_path(@classified_listing)
-  end
-
-  def destroy
-    @classified_listing = ClassifiedListing.find(params[:id])
-    @classified_listing.destroy
-    flash[:warning] = "'#{@classified_listing.title}' was destroyed successfully"
-    redirect_to internal_classified_listings_path
-  end
-
-  private
-
-  ALLOWED_PARAMS = %i[
-    published body_markdown title category classified_listing_category_id tag_list action
-  ].freeze
-  private_constant :ALLOWED_PARAMS
-
-  def listing_params
-    params.require(:classified_listing).permit(ALLOWED_PARAMS)
-  end
-
-  def handle_publish_status
-    unpublish_listing if listing_params[:published] == "0"
-    publish_listing if listing_params[:published] == "1"
-  end
-
-  def include_unpublished?
-    params[:include_unpublished] == "1"
-  end
-end
diff --git a/app/controllers/internal/listings_controller.rb b/app/controllers/internal/listings_controller.rb
new file mode 100644
index 000000000..4df8cb2a3
--- /dev/null
+++ b/app/controllers/internal/listings_controller.rb
@@ -0,0 +1,54 @@
+class Internal::ListingsController < Internal::ApplicationController
+  include ListingsToolkit
+  layout "internal"
+
+  def index
+    @listings =
+      Listing.includes(%i[user listing_category]).
+        page(params[:page]).order("bumped_at DESC").per(50)
+
+    @listings = @listings.published unless include_unpublished?
+    @listings = @listings.in_category(params[:filter]) if params[:filter].present?
+  end
+
+  def edit
+    @listing = Listing.find(params[:id])
+  end
+
+  def update
+    @listing = Listing.find(params[:id])
+    handle_publish_status if listing_params[:published]
+    bump_listing(@listing.cost) if listing_params[:action] == "bump"
+    update_listing_details
+    clear_listings_cache
+    flash[:success] = "Listing updated successfully"
+    redirect_to edit_internal_listing_path(@listing)
+  end
+
+  def destroy
+    @listing = Listing.find(params[:id])
+    @listing.destroy
+    flash[:warning] = "'#{@listing.title}' was destroyed successfully"
+    redirect_to internal_listings_path
+  end
+
+  private
+
+  ALLOWED_PARAMS = %i[
+    published body_markdown title category listing_category_id tag_list action
+  ].freeze
+  private_constant :ALLOWED_PARAMS
+
+  def listing_params
+    params.require(:listing).permit(ALLOWED_PARAMS)
+  end
+
+  def handle_publish_status
+    unpublish_listing if listing_params[:published] == "0"
+    publish_listing if listing_params[:published] == "1"
+  end
+
+  def include_unpublished?
+    params[:include_unpublished] == "1"
+  end
+end
diff --git a/app/controllers/classified_listings_controller.rb b/app/controllers/listings_controller.rb
similarity index 67%
rename from app/controllers/classified_listings_controller.rb
rename to app/controllers/listings_controller.rb
index b9d4953d8..fa7dc1095 100644
--- a/app/controllers/classified_listings_controller.rb
+++ b/app/controllers/listings_controller.rb
@@ -1,5 +1,5 @@
-class ClassifiedListingsController < ApplicationController
-  include ClassifiedListingsToolkit
+class ListingsController < ApplicationController
+  include ListingsToolkit
   before_action :check_limit, only: [:create]
 
   JSON_OPTIONS = {
@@ -11,39 +11,40 @@ class ClassifiedListingsController < ApplicationController
     }
   }.freeze
 
-  before_action :set_classified_listing, only: %i[edit update destroy]
+  before_action :set_listing, only: %i[edit update destroy]
   before_action :set_cache_control_headers, only: %i[index]
   before_action :raise_suspended, only: %i[new create update]
-  after_action :verify_authorized, only: %i[edit update]
   before_action :authenticate_user!, only: %i[edit update new dashboard]
+  after_action :verify_authorized, only: %i[edit update]
 
   def index
-    published_listings = ClassifiedListing.where(published: true)
-    @displayed_classified_listing = published_listings.find_by(slug: params[:slug]) if params[:slug]
+    published_listings = Listing.where(published: true)
+    @displayed_listing = published_listings.find_by(slug: params[:slug]) if params[:slug]
 
     if params[:view] == "moderate"
-      not_found unless @displayed_classified_listing
-      return redirect_to edit_internal_listing_path(id: @displayed_classified_listing.id)
+      not_found unless @displayed_listing
+      return redirect_to edit_internal_listing_path(id: @displayed_listing.id)
     end
 
-    @classified_listings =
+    @listings =
       if params[:category].blank?
         published_listings.
           order("bumped_at DESC").
           includes(:user, :organization, :taggings).
           limit(12)
       else
-        ClassifiedListing.none
+        Listing.none
       end
 
-    @listings_json = @classified_listings.to_json(JSON_OPTIONS)
-    @displayed_listing_json = @displayed_classified_listing.to_json(JSON_OPTIONS)
+    @listings_json = @listings.to_json(JSON_OPTIONS)
+    @displayed_listing_json = @displayed_listing.to_json(JSON_OPTIONS)
 
+    # TODO: [mkohl] Can we change this to listings-#{params[:category]}?
     set_surrogate_key_header "classified-listings-#{params[:category]}"
   end
 
   def new
-    @classified_listing = ClassifiedListing.new
+    @listing = Listing.new
     @organizations = current_user.organizations
     @credits = current_user.credits.unspent
   end
@@ -57,32 +58,32 @@ class ClassifiedListingsController < ApplicationController
   end
 
   def edit
-    authorize @classified_listing
+    authorize @listing
     @organizations = current_user.organizations
     @credits = current_user.credits.unspent
   end
 
   def dashboard
-    @classified_listings = current_user.classified_listings.
+    @listings = current_user.listings.
       includes(:organization, :taggings)
 
     organizations_ids = current_user.organization_memberships.
       where(type_of_user: "admin").
       pluck(:organization_id)
     @orgs = Organization.where(id: organizations_ids)
-    @org_listings = ClassifiedListing.where(organization_id: organizations_ids)
+    @org_listings = Listing.where(organization_id: organizations_ids)
     @user_credits = current_user.unspent_credits_count
   end
 
   def delete_confirm
-    @classified_listing = ClassifiedListing.find_by(slug: params[:slug])
-    not_found unless @classified_listing
-    authorize @classified_listing
+    @listing = Listing.find_by(slug: params[:slug])
+    not_found unless @listing
+    authorize @listing
   end
 
   def destroy
-    authorize @classified_listing
-    @classified_listing.destroy!
+    authorize @listing
+    @listing.destroy!
     redirect_to "/listings/dashboard", notice: "Listing was successfully deleted."
   end
 
@@ -101,7 +102,7 @@ class ClassifiedListingsController < ApplicationController
   end
 
   def process_successful_creation
-    redirect_to classified_listings_path
+    redirect_to listings_path
   end
 
   def process_unsuccessful_creation
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index eb30c0b00..7aeac8ff0 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,11 +1,11 @@
 class SearchController < ApplicationController
   before_action :authenticate_user!, only: %i[tags chat_channels reactions]
   before_action :format_integer_params
-  before_action :sanitize_params, only: %i[classified_listings reactions feed_content]
+  before_action :sanitize_params, only: %i[listings reactions feed_content]
 
-  CLASSIFIED_LISTINGS_PARAMS = [
+  LISTINGS_PARAMS = [
     :category,
-    :classified_listing_search,
+    :listing_search,
     :page,
     :per_page,
     :tag_boolean_mode,
@@ -65,9 +65,9 @@ class SearchController < ApplicationController
     render json: { result: ccm_docs }
   end
 
-  def classified_listings
-    cl_docs = Search::ClassifiedListing.search_documents(
-      params: classified_listing_params.to_h,
+  def listings
+    cl_docs = Search::Listing.search_documents(
+      params: listing_params.to_h,
     )
 
     render json: { result: cl_docs }
@@ -125,8 +125,8 @@ class SearchController < ApplicationController
     params.permit(accessible)
   end
 
-  def classified_listing_params
-    params.permit(CLASSIFIED_LISTINGS_PARAMS)
+  def listing_params
+    params.permit(LISTINGS_PARAMS)
   end
 
   def user_params
diff --git a/app/controllers/social_previews_controller.rb b/app/controllers/social_previews_controller.rb
index fc25d074e..a0d94009a 100644
--- a/app/controllers/social_previews_controller.rb
+++ b/app/controllers/social_previews_controller.rb
@@ -26,7 +26,7 @@ class SocialPreviewsController < ApplicationController
   end
 
   def listing
-    @listing = ClassifiedListing.find(params[:id]).decorate
+    @listing = Listing.find(params[:id]).decorate
     set_respond
   end
 
diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
index 7db08083d..988acef7f 100644
--- a/app/controllers/stories_controller.rb
+++ b/app/controllers/stories_controller.rb
@@ -4,7 +4,7 @@ class StoriesController < ApplicationController
       title path id user_id comments_count public_reactions_count organization_id
       reading_time video_thumbnail_url video video_duration_in_minutes language
       experience_level_rating experience_level_rating_distribution cached_user cached_organization
-      classified_listing_category_id
+      listing_category_id
     ],
     methods: %i[
       readable_publish_date cached_tag_list_array flare_tag class_name
@@ -157,7 +157,7 @@ class StoriesController < ApplicationController
     assign_feed_stories
     assign_hero_html
     assign_podcasts
-    assign_classified_listings
+    assign_listings
     get_latest_campaign_articles if SiteConfig.campaign_sidebar_enabled?
     @article_index = true
     @featured_story = (featured_story || Article.new)&.decorate
@@ -338,8 +338,8 @@ class StoriesController < ApplicationController
       select(:slug, :title, :podcast_id, :image)
   end
 
-  def assign_classified_listings
-    @classified_listings = ClassifiedListing.where(published: true).select(:title, :classified_listing_category_id, :slug, :bumped_at)
+  def assign_listings
+    @listings = Listing.where(published: true).select(:title, :classified_listing_category_id, :slug, :bumped_at)
   end
 
   def redirect_to_lowercase_username
diff --git a/app/dashboards/dashboard_manifest.rb b/app/dashboards/dashboard_manifest.rb
index 1b419b0f8..aa25438f0 100644
--- a/app/dashboards/dashboard_manifest.rb
+++ b/app/dashboards/dashboard_manifest.rb
@@ -29,7 +29,7 @@ class DashboardManifest
     html_variant_trials
     html_variant_successes
     sponsorships
-    classified_listing_categories
+    listing_categories
   ].freeze
   # DASHBOARDS = [
   #   :users,
diff --git a/app/dashboards/classified_listing_category_dashboard.rb b/app/dashboards/listing_category_dashboard.rb
similarity index 85%
rename from app/dashboards/classified_listing_category_dashboard.rb
rename to app/dashboards/listing_category_dashboard.rb
index 4f2d81e7e..e060e7528 100644
--- a/app/dashboards/classified_listing_category_dashboard.rb
+++ b/app/dashboards/listing_category_dashboard.rb
@@ -1,6 +1,6 @@
 require "administrate/base_dashboard"
 
-class ClassifiedListingCategoryDashboard < Administrate::BaseDashboard
+class ListingCategoryDashboard < Administrate::BaseDashboard
   # ATTRIBUTE_TYPES
   # a hash that describes the type of each of the model's fields.
   #
@@ -8,7 +8,7 @@ class ClassifiedListingCategoryDashboard < Administrate::BaseDashboard
   # which determines how the attribute is displayed
   # on pages throughout the dashboard.
   ATTRIBUTE_TYPES = {
-    classified_listings: Field::HasMany,
+    listings: Field::HasMany,
     id: Field::Number,
     cost: Field::Number,
     created_at: Field::DateTime,
@@ -72,10 +72,10 @@ class ClassifiedListingCategoryDashboard < Administrate::BaseDashboard
   #   }.freeze
   COLLECTION_FILTERS = {}.freeze
 
-  # Overwrite this method to customize how classified listing categories are displayed
+  # Overwrite this method to customize how listing categories are displayed
   # across all pages of the admin dashboard.
   #
-  # def display_resource(classified_listing_category)
-  #   "ClassifiedListingCategory ##{classified_listing_category.id}"
+  # def display_resource(listing_category)
+  #   "ListingCategory ##{listing_category.id}"
   # end
 end
diff --git a/app/decorators/classified_listing_decorator.rb b/app/decorators/listing_decorator.rb
similarity index 66%
rename from app/decorators/classified_listing_decorator.rb
rename to app/decorators/listing_decorator.rb
index 983c84f77..90409d75c 100644
--- a/app/decorators/classified_listing_decorator.rb
+++ b/app/decorators/listing_decorator.rb
@@ -1,13 +1,13 @@
-class ClassifiedListingDecorator < ApplicationDecorator
+class ListingDecorator < ApplicationDecorator
   DEFAULT_COLOR = "#000000".freeze
 
   def social_preview_category
-    category = object.classified_listing_category
+    category = object.listing_category
     category.social_preview_description.presence || category.name
   end
 
   def social_preview_color(brightness: 1.0)
-    category = object.classified_listing_category
+    category = object.listing_category
     color = category.social_preview_color.presence || DEFAULT_COLOR
     HexComparer.new([color]).brightness(brightness)
   end
diff --git a/app/helpers/classified_listing_helper.rb b/app/helpers/listing_helper.rb
similarity index 58%
rename from app/helpers/classified_listing_helper.rb
rename to app/helpers/listing_helper.rb
index 4be490d94..d3ed365a1 100644
--- a/app/helpers/classified_listing_helper.rb
+++ b/app/helpers/listing_helper.rb
@@ -1,18 +1,18 @@
-module ClassifiedListingHelper
+module ListingHelper
   def select_options_for_categories
-    ClassifiedListingCategory.select(:id, :name, :cost).map do |cl|
+    ListingCategory.select(:id, :name, :cost).map do |cl|
       ["#{cl.name} (#{cl.cost} #{'Credit'.pluralize(cl.cost)})", cl.id]
     end
   end
 
   def categories_for_display
-    ClassifiedListingCategory.pluck(:slug, :name).map do |slug, name|
+    ListingCategory.pluck(:slug, :name).map do |slug, name|
       { slug: slug, name: name }
     end
   end
 
   def categories_available
-    ClassifiedListingCategory.all.each_with_object({}) do |cat, h|
+    ListingCategory.all.each_with_object({}) do |cat, h|
       h[cat.slug] = cat.attributes.slice("cost", "name", "rules")
     end.deep_symbolize_keys
   end
diff --git a/app/javascript/article-form/__tests__/__snapshots__/articleForm.test.jsx.snap b/app/javascript/article-form/__tests__/__snapshots__/articleForm.test.jsx.snap
index 7f0ca6a2a..6533d8224 100644
--- a/app/javascript/article-form/__tests__/__snapshots__/articleForm.test.jsx.snap
+++ b/app/javascript/article-form/__tests__/__snapshots__/articleForm.test.jsx.snap
@@ -34,7 +34,7 @@ exports[`<ArticleForm /> renders properly 1`] = `
             autoComplete="off"
             class="articleform__tags"
             id="tag-input"
-            name="classified_listing[tag_list]"
+            name="listing[tag_list]"
             onBlur={[Function]}
             onFocus={[Function]}
             onInput={[Function]}
diff --git a/app/javascript/article-form/elements/__tests__/__snapshots__/tags.test.jsx.snap b/app/javascript/article-form/elements/__tests__/__snapshots__/tags.test.jsx.snap
index 2535d16b0..e10bc459c 100644
--- a/app/javascript/article-form/elements/__tests__/__snapshots__/tags.test.jsx.snap
+++ b/app/javascript/article-form/elements/__tests__/__snapshots__/tags.test.jsx.snap
@@ -19,7 +19,7 @@ exports[`<Tags /> renders properly 1`] = `
     autoComplete="off"
     class="articleform__tags"
     id="tag-input"
-    name="classified_listing[tag_list]"
+    name="listing[tag_list]"
     onBlur={[Function]}
     onFocus={[Function]}
     onInput={[Function]}
diff --git a/app/javascript/listings/__tests__/ClassifiedFilterTags.test.jsx b/app/javascript/listings/__tests__/ClassifiedFilterTags.test.jsx
index b29d9ac60..83959cb80 100644
--- a/app/javascript/listings/__tests__/ClassifiedFilterTags.test.jsx
+++ b/app/javascript/listings/__tests__/ClassifiedFilterTags.test.jsx
@@ -1,8 +1,8 @@
 import { h } from 'preact';
 import { deep } from 'preact-render-spy';
-import ClassifiedFiltersTags from '../components/ClassifiedFiltersTags';
+import ListingFiltersTags from '../components/ListingFiltersTags';
 
-describe('<ClassifiedFilterTags />', () => {
+describe('<ListingFilterTags />', () => {
   const firstTag = {
     id: 1,
     tag: 'clojure',
@@ -36,11 +36,11 @@ describe('<ClassifiedFilterTags />', () => {
     tags: getTags(),
   });
 
-  const renderClassifiedFilterTags = (props = getProps()) =>
-    deep(<ClassifiedFiltersTags {...props} />);
+  const renderListingFilterTags = (props = getProps()) =>
+    deep(<ListingFiltersTags {...props} />);
 
   describe('Should render a search field', () => {
-    const context = renderClassifiedFilterTags();
+    const context = renderListingFilterTags();
     const searchField = context.find('#listings-search');
 
     it('Should have "search" as placeholder', () => {
@@ -57,7 +57,7 @@ describe('<ClassifiedFilterTags />', () => {
   });
 
   describe('<ClearQueryButton />', () => {
-    const context = renderClassifiedFilterTags();
+    const context = renderListingFilterTags();
 
     it('Should render the clear query button', () => {
       expect(context.find('#clear-query-button').exists()).toBe(true);
@@ -65,7 +65,7 @@ describe('<ClassifiedFilterTags />', () => {
 
     it('Should not render the clear query button', () => {
       const propsWithoutQuery = { ...getProps(), query: '' };
-      const contextWithAnotherProps = renderClassifiedFilterTags(
+      const contextWithAnotherProps = renderListingFilterTags(
         propsWithoutQuery,
       );
 
@@ -76,7 +76,7 @@ describe('<ClassifiedFilterTags />', () => {
   });
 
   it('Should render the selected Tags', () => {
-    const context = renderClassifiedFilterTags();
+    const context = renderListingFilterTags();
     getTags().forEach((tag) => {
       const selectedTag = context.find(`#selected-tag-${tag.id}`);
 
diff --git a/app/javascript/listings/__tests__/ClassifiedFilters.test.jsx b/app/javascript/listings/__tests__/ClassifiedFilters.test.jsx
index f4a11db2b..ceb1494b2 100644
--- a/app/javascript/listings/__tests__/ClassifiedFilters.test.jsx
+++ b/app/javascript/listings/__tests__/ClassifiedFilters.test.jsx
@@ -1,8 +1,8 @@
 import { h } from 'preact';
 import render from 'preact-render-to-json';
-import ClassifiedFilters from '../components/ClassifiedFilters';
+import ListingFilters from '../components/ListingFilters';
 
-describe('<ClassifiedFilters />', () => {
+describe('<ListingFilters />', () => {
   const firstTag = {
     id: 1,
     tag: 'clojure',
@@ -61,11 +61,11 @@ describe('<ClassifiedFilters />', () => {
     tags: getTags(),
   });
 
-  const renderClassifiedFilters = (props = getProps()) =>
-    render(<ClassifiedFilters {...props} />);
+  const renderListingFilters = (props = getProps()) =>
+    render(<ListingFilters {...props} />);
 
   it('Should match the snapshot', () => {
-    const context = renderClassifiedFilters();
+    const context = renderListingFilters();
     expect(context).toMatchSnapshot();
   });
 });
diff --git a/app/javascript/listings/__tests__/ClassifiedFiltersCategories.test.jsx b/app/javascript/listings/__tests__/ClassifiedFiltersCategories.test.jsx
index ce6b908cb..02df34200 100644
--- a/app/javascript/listings/__tests__/ClassifiedFiltersCategories.test.jsx
+++ b/app/javascript/listings/__tests__/ClassifiedFiltersCategories.test.jsx
@@ -1,8 +1,8 @@
 import { h } from 'preact';
 import { deep } from 'preact-render-spy';
-import ClassifiedFiltersCategories from '../components/ClassifiedFiltersCategories';
+import ListingFiltersCategories from '../components/ListingFiltersCategories';
 
-describe('<ClassifiedFiltersCategories />', () => {
+describe('<ListingFiltersCategories />', () => {
   const firstCategory = {
     id: 20,
     slug: 'clojure',
@@ -31,11 +31,11 @@ describe('<ClassifiedFiltersCategories />', () => {
     },
   });
 
-  const renderClassifiedFilterCategories = (props = getProps()) =>
-    deep(<ClassifiedFiltersCategories {...props} />);
+  const renderListingFilterCategories = (props = getProps()) =>
+    deep(<ListingFiltersCategories {...props} />);
 
   describe('Should render the links to allow navigation', () => {
-    const context = renderClassifiedFilterCategories();
+    const context = renderListingFilterCategories();
 
     it('Should render a link and a message relative to listings', () => {
       const listingsLink = context.find('#listings-link');
@@ -47,7 +47,7 @@ describe('<ClassifiedFiltersCategories />', () => {
 
     it('When there\'s no category, the className of the listings link should be "selected"', () => {
       const propsWithoutCategory = { ...getProps(), category: '' };
-      const contextWithoutCategory = renderClassifiedFilterCategories(
+      const contextWithoutCategory = renderListingFilterCategories(
         propsWithoutCategory,
       );
 
@@ -59,7 +59,7 @@ describe('<ClassifiedFiltersCategories />', () => {
       const newListingLink = context.find('#listings-new-link');
 
       expect(newListingLink.attr('href')).toBe('/listings/new');
-      expect(newListingLink.attr('className')).toBe('classified-create-link');
+      expect(newListingLink.attr('className')).toBe('listing-create-link');
       expect(newListingLink.text()).toBe('Create a Listing');
     });
 
@@ -67,13 +67,13 @@ describe('<ClassifiedFiltersCategories />', () => {
       const dashboardLink = context.find('#listings-dashboard-link');
 
       expect(dashboardLink.attr('href')).toBe('/listings/dashboard');
-      expect(dashboardLink.attr('className')).toBe('classified-create-link');
+      expect(dashboardLink.attr('className')).toBe('listing-create-link');
       expect(dashboardLink.text()).toBe('Manage Listings');
     });
   });
 
   describe('Should render categories links', () => {
-    const context = renderClassifiedFilterCategories();
+    const context = renderListingFilterCategories();
     it('Should render the categories name and their respective links', () => {
       categories.forEach((category) => {
         const categoryLink = context.find(`#category-link-${category.id}`);
diff --git a/app/javascript/listings/__tests__/ListingDashboard.test.jsx b/app/javascript/listings/__tests__/ListingDashboard.test.jsx
index 4c2fcc4d7..2d723f601 100644
--- a/app/javascript/listings/__tests__/ListingDashboard.test.jsx
+++ b/app/javascript/listings/__tests__/ListingDashboard.test.jsx
@@ -58,7 +58,7 @@ const l = [
     },
   },
 ];
-global.document.body.innerHTML = `<div id="classifieds-listings-dashboard" data-listings=${JSON.stringify(
+global.document.body.innerHTML = `<div id="listings-dashboard" data-listings=${JSON.stringify(
   l,
 )} data-usercredits="3" data-orglistings=${JSON.stringify([
   {
diff --git a/app/javascript/listings/__tests__/SingleListing.test.jsx b/app/javascript/listings/__tests__/SingleListing.test.jsx
index ac75d9572..ff12c1f03 100644
--- a/app/javascript/listings/__tests__/SingleListing.test.jsx
+++ b/app/javascript/listings/__tests__/SingleListing.test.jsx
@@ -59,12 +59,12 @@ describe('<SingleListing />', () => {
         isOpen={false}
       />,
     );
-    expect(context.find('.single-classified-listing').exists()).toBeTruthy();
+    expect(context.find('.single-listing').exists()).toBeTruthy();
 
     it('for listing title', () => {
       expect(
         context
-          .find('.single-classified-listing-header')
+          .find('.single-listing-header')
           .at(0)
           .childAt(0)
           .childAt(0)
@@ -73,35 +73,26 @@ describe('<SingleListing />', () => {
     });
 
     it('for listing tags', () => {
-      expect(
-        context.find('.single-classified-listing-tags').childAt(0).text(),
-      ).toEqual(listing.tags[0]);
+      expect(context.find('.single-listing-tags').childAt(0).text()).toEqual(
+        listing.tags[0],
+      );
     });
 
     it('for listing category', () => {
       expect(
-        context
-          .find('.single-classified-listing-author-info')
-          .childAt(0)
-          .text(),
+        context.find('.single-listing-author-info').childAt(0).text(),
       ).toEqual(listing.category);
     });
 
     it('for listing location', () => {
       expect(
-        context
-          .find('.single-classified-listing-author-info')
-          .childAt(1)
-          .text(),
+        context.find('.single-listing-author-info').childAt(1).text(),
       ).toEqual(`・${listing.location}`);
     });
 
     it('for listing author', () => {
       expect(
-        context
-          .find('.single-classified-listing-author-info')
-          .childAt(3)
-          .text(),
+        context.find('.single-listing-author-info').childAt(3).text(),
       ).toEqual(listing.author.name);
     });
   });
diff --git a/app/javascript/listings/__tests__/__snapshots__/AllListings.test.jsx.snap b/app/javascript/listings/__tests__/__snapshots__/AllListings.test.jsx.snap
index 63bef9f16..44b7fab2e 100644
--- a/app/javascript/listings/__tests__/__snapshots__/AllListings.test.jsx.snap
+++ b/app/javascript/listings/__tests__/__snapshots__/AllListings.test.jsx.snap
@@ -2,18 +2,18 @@
 
 exports[`<AllListings /> Should render all listings 1`] = `
 <div
-  class="classifieds-columns"
-  id="classified-listings-results"
+  class="listings-columns"
+  id="listings-results"
 >
   <div
-    class="single-classified-listing"
-    id="single-classified-listing-20"
+    class="single-listing"
+    id="single-listing-20"
   >
     <div
       class="listing-content"
     >
       <h3
-        class="single-classified-listing-header"
+        class="single-listing-header"
       >
         <a
           data-listing-id={20}
@@ -46,7 +46,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
               class="dropdown-content "
             >
               <a
-                class="classified-listing-edit-button"
+                class="listing-edit-button"
                 href="/listings/20/edit"
               >
                 Edit
@@ -56,7 +56,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
         </div>
       </h3>
       <div
-        class="single-classified-listing-body"
+        class="single-listing-body"
         dangerouslySetInnerHTML={
           Object {
             "__html": "<p>Eius et ullam. Dolores et qui. Quis <strong>qui</strong> omnis.</p>
@@ -65,7 +65,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
         }
       />
       <div
-        class="single-classified-listing-tags"
+        class="single-listing-tags"
       >
         <a
           data-no-instant={true}
@@ -83,7 +83,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
         </a>
       </div>
       <div
-        class="single-classified-listing-author-info"
+        class="single-listing-author-info"
       >
         <a
           data-no-instant={true}
@@ -107,14 +107,14 @@ exports[`<AllListings /> Should render all listings 1`] = `
     </div>
   </div>
   <div
-    class="single-classified-listing"
-    id="single-classified-listing-21"
+    class="single-listing"
+    id="single-listing-21"
   >
     <div
       class="listing-content"
     >
       <h3
-        class="single-classified-listing-header"
+        class="single-listing-header"
       >
         <a
           data-listing-id={21}
@@ -147,7 +147,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
               class="dropdown-content "
             >
               <a
-                class="classified-listing-edit-button"
+                class="listing-edit-button"
                 href="/listings/21/edit"
               >
                 Edit
@@ -157,7 +157,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
         </div>
       </h3>
       <div
-        class="single-classified-listing-body"
+        class="single-listing-body"
         dangerouslySetInnerHTML={
           Object {
             "__html": "<p>Eius et ullam. Dolores et qui. Quis <strong>qui</strong> omnis.</p>
@@ -166,7 +166,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
         }
       />
       <div
-        class="single-classified-listing-tags"
+        class="single-listing-tags"
       >
         <a
           data-no-instant={true}
@@ -184,7 +184,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
         </a>
       </div>
       <div
-        class="single-classified-listing-author-info"
+        class="single-listing-author-info"
       >
         <a
           data-no-instant={true}
@@ -208,14 +208,14 @@ exports[`<AllListings /> Should render all listings 1`] = `
     </div>
   </div>
   <div
-    class="single-classified-listing"
-    id="single-classified-listing-22"
+    class="single-listing"
+    id="single-listing-22"
   >
     <div
       class="listing-content"
     >
       <h3
-        class="single-classified-listing-header"
+        class="single-listing-header"
       >
         <a
           data-listing-id={22}
@@ -248,7 +248,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
               class="dropdown-content "
             >
               <a
-                class="classified-listing-edit-button"
+                class="listing-edit-button"
                 href="/listings/22/edit"
               >
                 Edit
@@ -258,7 +258,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
         </div>
       </h3>
       <div
-        class="single-classified-listing-body"
+        class="single-listing-body"
         dangerouslySetInnerHTML={
           Object {
             "__html": "<p>Eius et ullam. Dolores et qui. Quis <strong>qui</strong> omnis.</p>
@@ -267,7 +267,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
         }
       />
       <div
-        class="single-classified-listing-tags"
+        class="single-listing-tags"
       >
         <a
           data-no-instant={true}
@@ -285,7 +285,7 @@ exports[`<AllListings /> Should render all listings 1`] = `
         </a>
       </div>
       <div
-        class="single-classified-listing-author-info"
+        class="single-listing-author-info"
       >
         <a
           data-no-instant={true}
diff --git a/app/javascript/listings/__tests__/__snapshots__/BodyMarkdown.test.jsx.snap b/app/javascript/listings/__tests__/__snapshots__/BodyMarkdown.test.jsx.snap
index fa57be855..abbcd163b 100644
--- a/app/javascript/listings/__tests__/__snapshots__/BodyMarkdown.test.jsx.snap
+++ b/app/javascript/listings/__tests__/__snapshots__/BodyMarkdown.test.jsx.snap
@@ -13,7 +13,7 @@ exports[`<BodyMarkdown /> Should match the snapshot 1`] = `
       class="listingform__input listingform__bodymarkdown"
       id="body_markdown"
       maxLength="400"
-      name="classified_listing[body_markdown]"
+      name="listing[body_markdown]"
       onInput={[Function]}
       placeholder="400 characters max, 12 line break max, no images allowed, *markdown is encouraged*"
     />
diff --git a/app/javascript/listings/__tests__/__snapshots__/ClassifiedFilters.test.jsx.snap b/app/javascript/listings/__tests__/__snapshots__/ClassifiedFilters.test.jsx.snap
index 35dbd7d36..8c74518d5 100644
--- a/app/javascript/listings/__tests__/__snapshots__/ClassifiedFilters.test.jsx.snap
+++ b/app/javascript/listings/__tests__/__snapshots__/ClassifiedFilters.test.jsx.snap
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<ClassifiedFilters /> Should match the snapshot 1`] = `
+exports[`<ListingFilters /> Should match the snapshot 1`] = `
 <div
-  class="classified-filters"
-  id="classified-filters"
+  class="listing-filters"
+  id="listing-filters"
 >
   <div
-    class="classified-filters-categories"
+    class="listing-filters-categories"
   >
     <a
       data-no-instant={true}
@@ -47,14 +47,14 @@ exports[`<ClassifiedFilters /> Should match the snapshot 1`] = `
       </a>
     </section>
     <a
-      class="classified-create-link"
+      class="listing-create-link"
       href="/listings/new"
       id="listings-new-link"
     >
       Create a Listing
     </a>
     <a
-      class="classified-create-link"
+      class="listing-create-link"
       href="/listings/dashboard"
       id="listings-dashboard-link"
     >
@@ -62,8 +62,8 @@ exports[`<ClassifiedFilters /> Should match the snapshot 1`] = `
     </a>
   </div>
   <div
-    class="classified-filters-tags"
-    id="classified-filters-tags"
+    class="listing-filters-tags"
+    id="listing-filters-tags"
   >
     <input
       autoComplete="off"
@@ -74,7 +74,7 @@ exports[`<ClassifiedFilters /> Should match the snapshot 1`] = `
       type="text"
     />
     <button
-      class="classified-search-clear"
+      class="listing-search-clear"
       id="clear-query-button"
       onClick={[Function]}
       type="button"
@@ -83,7 +83,7 @@ exports[`<ClassifiedFilters /> Should match the snapshot 1`] = `
     </button>
     <section>
       <span
-        class="classified-tag"
+        class="listing-tag"
         id="selected-tag-1"
       >
         <a
@@ -110,7 +110,7 @@ exports[`<ClassifiedFilters /> Should match the snapshot 1`] = `
         </a>
       </span>
       <span
-        class="classified-tag"
+        class="listing-tag"
         id="selected-tag-2"
       >
         <a
@@ -137,7 +137,7 @@ exports[`<ClassifiedFilters /> Should match the snapshot 1`] = `
         </a>
       </span>
       <span
-        class="classified-tag"
+        class="listing-tag"
         id="selected-tag-3"
       >
         <a
diff --git a/app/javascript/listings/__tests__/__snapshots__/ClearQueryButton.test.jsx.snap b/app/javascript/listings/__tests__/__snapshots__/ClearQueryButton.test.jsx.snap
index 8973a47e0..b16ea80c2 100644
--- a/app/javascript/listings/__tests__/__snapshots__/ClearQueryButton.test.jsx.snap
+++ b/app/javascript/listings/__tests__/__snapshots__/ClearQueryButton.test.jsx.snap
@@ -2,7 +2,7 @@
 
 exports[`<ClearQueryButton /> Should match the snapshot 1`] = `
 <button
-  class="classified-search-clear"
+  class="listing-search-clear"
   id="clear-query-button"
   onClick={[Function]}
   type="button"
diff --git a/app/javascript/listings/__tests__/__snapshots__/ModalBackground.test.jsx.snap b/app/javascript/listings/__tests__/__snapshots__/ModalBackground.test.jsx.snap
index c19738946..9a866416a 100644
--- a/app/javascript/listings/__tests__/__snapshots__/ModalBackground.test.jsx.snap
+++ b/app/javascript/listings/__tests__/__snapshots__/ModalBackground.test.jsx.snap
@@ -4,10 +4,10 @@ exports[`<ModalBackground /> Should match the snapshot 1`] = `
 preact-render-spy (1 nodes)
 -------
 <div
-  class="classified-listings-modal-background"
+  class="listings-modal-background"
   onClick={[Function onClick]}
   role="presentation"
-  id="classified-listings-modal-background"
+  id="listings-modal-background"
 >
 </div>
 
diff --git a/app/javascript/listings/__tests__/__snapshots__/NextPageButton.test.jsx.snap b/app/javascript/listings/__tests__/__snapshots__/NextPageButton.test.jsx.snap
index 36dbb9097..5fce47e5e 100644
--- a/app/javascript/listings/__tests__/__snapshots__/NextPageButton.test.jsx.snap
+++ b/app/javascript/listings/__tests__/__snapshots__/NextPageButton.test.jsx.snap
@@ -3,7 +3,7 @@
 exports[`<NextPageButton /> Should match the snapshot 1`] = `
 preact-render-spy (1 nodes)
 -------
-<div class="classifieds-load-more-button">
+<div class="listings-load-more-button">
   <button
     onClick={[Function onClick]}
     type="button"
diff --git a/app/javascript/listings/__tests__/__snapshots__/SelectedTags.test.jsx.snap b/app/javascript/listings/__tests__/__snapshots__/SelectedTags.test.jsx.snap
index 3c55fb257..d867b16cc 100644
--- a/app/javascript/listings/__tests__/__snapshots__/SelectedTags.test.jsx.snap
+++ b/app/javascript/listings/__tests__/__snapshots__/SelectedTags.test.jsx.snap
@@ -3,7 +3,7 @@
 exports[`<SelectedTags /> Should render all the tags 1`] = `
 <section>
   <span
-    class="classified-tag"
+    class="listing-tag"
     id="selected-tag-1"
   >
     <a
@@ -30,7 +30,7 @@ exports[`<SelectedTags /> Should render all the tags 1`] = `
     </a>
   </span>
   <span
-    class="classified-tag"
+    class="listing-tag"
     id="selected-tag-2"
   >
     <a
@@ -57,7 +57,7 @@ exports[`<SelectedTags /> Should render all the tags 1`] = `
     </a>
   </span>
   <span
-    class="classified-tag"
+    class="listing-tag"
     id="selected-tag-3"
   >
     <a
diff --git a/app/javascript/listings/__tests__/__snapshots__/SingleListing.test.jsx.snap b/app/javascript/listings/__tests__/__snapshots__/SingleListing.test.jsx.snap
index c99b4f1ca..5cb6d62d6 100644
--- a/app/javascript/listings/__tests__/__snapshots__/SingleListing.test.jsx.snap
+++ b/app/javascript/listings/__tests__/__snapshots__/SingleListing.test.jsx.snap
@@ -4,11 +4,11 @@ exports[`<SingleListing /> should load a single user listing 1`] = `
 preact-render-spy (1 nodes)
 -------
 <div
-  class="single-classified-listing"
-  id="single-classified-listing-22"
+  class="single-listing"
+  id="single-listing-22"
 >
   <div class="listing-content">
-    <h3 class="single-classified-listing-header">
+    <h3 class="single-listing-header">
       <a
         href="/listings/misc/illo-iure-quos-perspiciatis-5hk7"
         data-no-instant={true}
@@ -37,11 +37,11 @@ preact-render-spy (1 nodes)
         </div>
       </div>
     </h3>
-    <div class="single-classified-listing-body">
+    <div class="single-listing-body">
       <p>Eius et ullam. Dolores et qui. Quis <strong>qui</strong> omnis.</p>
       
     </div>
-    <div class="single-classified-listing-tags">
+    <div class="single-listing-tags">
       <a
         href="/listings?t=go"
         onClick={[Function onClick]}
@@ -57,7 +57,7 @@ preact-render-spy (1 nodes)
         git
       </a>
     </div>
-    <div class="single-classified-listing-author-info">
+    <div class="single-listing-author-info">
       <a
         href="/listings/misc"
         onClick={[Function onClick]}
diff --git a/app/javascript/listings/components/AllListings.jsx b/app/javascript/listings/components/AllListings.jsx
index 0889bc769..2455361a8 100644
--- a/app/javascript/listings/components/AllListings.jsx
+++ b/app/javascript/listings/components/AllListings.jsx
@@ -10,7 +10,7 @@ const AllListings = ({
   onOpenModal,
 }) => {
   return (
-    <div className="classifieds-columns" id="classified-listings-results">
+    <div className="listings-columns" id="listings-results">
       {listings.map((listing) => (
         <SingleListing
           onAddTag={onAddTag}
diff --git a/app/javascript/listings/components/BodyMarkdown.jsx b/app/javascript/listings/components/BodyMarkdown.jsx
index e242897f3..62b5649ad 100644
--- a/app/javascript/listings/components/BodyMarkdown.jsx
+++ b/app/javascript/listings/components/BodyMarkdown.jsx
@@ -8,7 +8,7 @@ const BodyMarkdown = ({ onChange, defaultValue }) => (
       <textarea
         className="listingform__input listingform__bodymarkdown"
         id="body_markdown"
-        name="classified_listing[body_markdown]"
+        name="listing[body_markdown]"
         maxLength="400"
         placeholder="400 characters max, 12 line break max, no images allowed, *markdown is encouraged*"
         value={defaultValue}
diff --git a/app/javascript/listings/components/Categories.jsx b/app/javascript/listings/components/Categories.jsx
index 4deefce37..6179eb2d3 100644
--- a/app/javascript/listings/components/Categories.jsx
+++ b/app/javascript/listings/components/Categories.jsx
@@ -42,7 +42,7 @@ class Categories extends Component {
         <select
           id="category"
           className="listingform__input"
-          name="classified_listing[classified_listing_category_id]"
+          name="listing[listing_category_id]"
           onChange={onChange}
           onBlur={onChange}
         >
diff --git a/app/javascript/listings/components/ClearQueryButton.jsx b/app/javascript/listings/components/ClearQueryButton.jsx
index 238e4f59e..b91f9fd4e 100644
--- a/app/javascript/listings/components/ClearQueryButton.jsx
+++ b/app/javascript/listings/components/ClearQueryButton.jsx
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 const ClearQueryButton = ({ onClick }) => (
   <button
     type="button"
-    className="classified-search-clear"
+    className="listing-search-clear"
     onClick={onClick}
     id="clear-query-button"
   >
diff --git a/app/javascript/listings/components/ContactViaConnect.jsx b/app/javascript/listings/components/ContactViaConnect.jsx
index 5d3534ad0..3b241d069 100644
--- a/app/javascript/listings/components/ContactViaConnect.jsx
+++ b/app/javascript/listings/components/ContactViaConnect.jsx
@@ -14,7 +14,7 @@ const ContactViaConnect = ({ onChange, checked }) => (
       type="checkbox"
       className="listingform__input listingform__contact_via_connect"
       id="contact_via_connect"
-      name="classified_listing[contact_via_connect]"
+      name="listing[contact_via_connect]"
       onInput={onChange}
       checked={checked}
     />
diff --git a/app/javascript/listings/components/ExpireDate.jsx b/app/javascript/listings/components/ExpireDate.jsx
index 63fef24be..f6cbac32d 100644
--- a/app/javascript/listings/components/ExpireDate.jsx
+++ b/app/javascript/listings/components/ExpireDate.jsx
@@ -19,7 +19,7 @@ const ExpireDate = ({ onChange, defaultValue }) => {
         type="date"
         className="listingform__input"
         id="expires_at"
-        name="classified_listing[expires_at]"
+        name="listing[expires_at]"
         value={defaultValue}
         onInput={onChange}
         min={tomorrow}
diff --git a/app/javascript/listings/components/ClassifiedFilters.jsx b/app/javascript/listings/components/ListingFilters.jsx
similarity index 73%
rename from app/javascript/listings/components/ClassifiedFilters.jsx
rename to app/javascript/listings/components/ListingFilters.jsx
index 8a7d3fc0f..604720551 100644
--- a/app/javascript/listings/components/ClassifiedFilters.jsx
+++ b/app/javascript/listings/components/ListingFilters.jsx
@@ -1,10 +1,10 @@
 import { h } from 'preact';
 import PropTypes from 'prop-types';
-import ClassifiedFiltersCategories from './ClassifiedFiltersCategories';
-import ClassifiedFiltersTags from './ClassifiedFiltersTags';
+import ListingFiltersCategories from './ListingFiltersCategories';
+import ListingFiltersTags from './ListingFiltersTags';
 import { tagPropTypes } from '../../common-prop-types';
 
-const ClassifiedFilters = ({
+const ListingFilters = ({
   categories,
   category,
   onSelectCategory,
@@ -17,13 +17,13 @@ const ClassifiedFilters = ({
   query,
 }) => {
   return (
-    <div className="classified-filters" id="classified-filters">
-      <ClassifiedFiltersCategories
+    <div className="listing-filters" id="listing-filters">
+      <ListingFiltersCategories
         categories={categories}
         category={category}
         onClick={onSelectCategory}
       />
-      <ClassifiedFiltersTags
+      <ListingFiltersTags
         message={message}
         onKeyUp={onKeyUp}
         onClearQuery={onClearQuery}
@@ -36,7 +36,7 @@ const ClassifiedFilters = ({
   );
 };
 
-ClassifiedFilters.propTypes = {
+ListingFilters.propTypes = {
   categories: PropTypes.isRequired,
   category: PropTypes.isRequired,
   onSelectCategory: PropTypes.func.isRequired,
@@ -49,4 +49,4 @@ ClassifiedFilters.propTypes = {
   query: PropTypes.string.isRequired,
 };
 
-export default ClassifiedFilters;
+export default ListingFilters;
diff --git a/app/javascript/listings/components/ClassifiedFiltersCategories.jsx b/app/javascript/listings/components/ListingFiltersCategories.jsx
similarity index 71%
rename from app/javascript/listings/components/ClassifiedFiltersCategories.jsx
rename to app/javascript/listings/components/ListingFiltersCategories.jsx
index 2fb3d27d7..0da6d0cd8 100644
--- a/app/javascript/listings/components/ClassifiedFiltersCategories.jsx
+++ b/app/javascript/listings/components/ListingFiltersCategories.jsx
@@ -2,8 +2,8 @@ import { h } from 'preact';
 import PropTypes from 'prop-types';
 import CategoryLinks from './CategoryLinks';
 
-const ClassifiedFiltersCategories = ({ categories, category, onClick }) => (
-  <div className="classified-filters-categories">
+const ListingFiltersCategories = ({ categories, category, onClick }) => (
+  <div className="listing-filters-categories">
     <a
       id="listings-link"
       href="/listings"
@@ -21,24 +21,24 @@ const ClassifiedFiltersCategories = ({ categories, category, onClick }) => (
     <a
       id="listings-new-link"
       href="/listings/new"
-      className="classified-create-link"
+      className="listing-create-link"
     >
       Create a Listing
     </a>
     <a
       id="listings-dashboard-link"
       href="/listings/dashboard"
-      className="classified-create-link"
+      className="listing-create-link"
     >
       Manage Listings
     </a>
   </div>
 );
 
-ClassifiedFiltersCategories.propTypes = {
+ListingFiltersCategories.propTypes = {
   categories: PropTypes.isRequired,
   onClick: PropTypes.func.isRequired,
   category: PropTypes.isRequired,
 };
 
-export default ClassifiedFiltersCategories;
+export default ListingFiltersCategories;
diff --git a/app/javascript/listings/components/ClassifiedFiltersTags.jsx b/app/javascript/listings/components/ListingFiltersTags.jsx
similarity index 85%
rename from app/javascript/listings/components/ClassifiedFiltersTags.jsx
rename to app/javascript/listings/components/ListingFiltersTags.jsx
index 11b70b8e0..d5e166cb9 100644
--- a/app/javascript/listings/components/ClassifiedFiltersTags.jsx
+++ b/app/javascript/listings/components/ListingFiltersTags.jsx
@@ -4,7 +4,7 @@ import { tagPropTypes } from '../../common-prop-types';
 import ClearQueryButton from './ClearQueryButton';
 import SelectedTags from './SelectedTags';
 
-const ClassifiedFiltersTags = ({
+const ListingFiltersTags = ({
   message,
   onKeyUp,
   onClearQuery,
@@ -16,7 +16,7 @@ const ClassifiedFiltersTags = ({
   const shouldRenderClearQueryButton = query.length > 0;
 
   return (
-    <div className="classified-filters-tags" id="classified-filters-tags">
+    <div className="listing-filters-tags" id="listing-filters-tags">
       <input
         type="text"
         placeholder="search"
@@ -33,7 +33,7 @@ const ClassifiedFiltersTags = ({
   );
 };
 
-ClassifiedFiltersTags.propTypes = {
+ListingFiltersTags.propTypes = {
   message: PropTypes.string.isRequired,
   onKeyUp: PropTypes.func.isRequired,
   onClearQuery: PropTypes.func.isRequired,
@@ -43,4 +43,4 @@ ClassifiedFiltersTags.propTypes = {
   query: PropTypes.string.isRequired,
 };
 
-export default ClassifiedFiltersTags;
+export default ListingFiltersTags;
diff --git a/app/javascript/listings/components/Modal.jsx b/app/javascript/listings/components/Modal.jsx
index eb66b9956..fd2d2ad52 100644
--- a/app/javascript/listings/components/Modal.jsx
+++ b/app/javascript/listings/components/Modal.jsx
@@ -17,10 +17,10 @@ const Modal = ({
   const shouldRenderMessageModal = listing && listing.contact_via_connect;
 
   return (
-    <div className="single-classified-listing-container">
+    <div className="single-listing-container">
       <div
-        id="single-classified-listing-container__inner"
-        className="single-classified-listing-container__inner"
+        id="single-listing-container__inner"
+        className="single-listing-container__inner"
         onClick={onClick}
         role="button"
         onKeyPress={onClick}
@@ -42,13 +42,10 @@ const Modal = ({
             listing={listing}
           />
         )}
-        <a
-          href="/about-listings"
-          className="single-classified-listing-info-link"
-        >
+        <a href="/about-listings" className="single-listing-info-link">
           About DEV Listings
         </a>
-        <div className="single-classified-listing-container__spacer" />
+        <div className="single-listing-container__spacer" />
       </div>
     </div>
   );
diff --git a/app/javascript/listings/components/ModalBackground.jsx b/app/javascript/listings/components/ModalBackground.jsx
index 85919bb17..795455280 100644
--- a/app/javascript/listings/components/ModalBackground.jsx
+++ b/app/javascript/listings/components/ModalBackground.jsx
@@ -3,10 +3,10 @@ import PropTypes from 'prop-types';
 
 const ModalBackground = ({ onClick }) => (
   <div
-    className="classified-listings-modal-background"
+    className="listings-modal-background"
     onClick={onClick}
     role="presentation"
-    id="classified-listings-modal-background"
+    id="listings-modal-background"
   />
 );
 
diff --git a/app/javascript/listings/components/NextPageButton.jsx b/app/javascript/listings/components/NextPageButton.jsx
index 19209223e..131f28ba2 100644
--- a/app/javascript/listings/components/NextPageButton.jsx
+++ b/app/javascript/listings/components/NextPageButton.jsx
@@ -2,7 +2,7 @@ import { h } from 'preact';
 import PropTypes from 'prop-types';
 
 const NextPageButton = ({ onClick }) => (
-  <div className="classifieds-load-more-button">
+  <div className="listings-load-more-button">
     <button onClick={onClick} type="button">
       Load More Listings
     </button>
diff --git a/app/javascript/listings/components/SelectedTags.jsx b/app/javascript/listings/components/SelectedTags.jsx
index e45109bb2..2e8898a35 100644
--- a/app/javascript/listings/components/SelectedTags.jsx
+++ b/app/javascript/listings/components/SelectedTags.jsx
@@ -6,7 +6,7 @@ const SelectedTags = ({ tags, onClick, onKeyPress }) => {
     <section>
       {tags.map((tag) => (
         <span
-          className="classified-tag"
+          className="listing-tag"
           key={tag.id}
           id={`selected-tag-${tag.id}`}
         >
diff --git a/app/javascript/listings/components/Title.jsx b/app/javascript/listings/components/Title.jsx
index a8c325b2c..43a37bf16 100644
--- a/app/javascript/listings/components/Title.jsx
+++ b/app/javascript/listings/components/Title.jsx
@@ -12,7 +12,7 @@ const Title = ({ onChange, defaultValue }) => (
       type="text"
       className="listingform__input"
       id={domId}
-      name="classified_listing[title]"
+      name="listing[title]"
       maxLength="128"
       size="128"
       placeholder="128 characters max, plain text"
diff --git a/app/javascript/listings/listingDashboard.jsx b/app/javascript/listings/listingDashboard.jsx
index 735235a86..b812ac62b 100644
--- a/app/javascript/listings/listingDashboard.jsx
+++ b/app/javascript/listings/listingDashboard.jsx
@@ -14,7 +14,7 @@ export class ListingDashboard extends Component {
 
   componentDidMount() {
     const t = this;
-    const container = document.getElementById('classifieds-listings-dashboard');
+    const container = document.getElementById('listings-dashboard');
     let listings = [];
     let orgs = [];
     let orgListings = [];
@@ -38,24 +38,24 @@ export class ListingDashboard extends Component {
       sort,
     } = this.state;
 
-    const isExpired = listing =>
+    const isExpired = (listing) =>
       listing.bumped_at && !listing.published
         ? (Date.now() - new Date(listing.bumped_at.toString()).getTime()) /
             (1000 * 60 * 60 * 24) >
           30
         : false;
-    const isDraft = listing =>
+    const isDraft = (listing) =>
       listing.bumped_at ? !isExpired(listing) && !listing.published : true;
 
     const filterListings = (listingsToFilter, selectedFilter) => {
       if (selectedFilter === 'Draft') {
-        return listingsToFilter.filter(listing => isDraft(listing));
+        return listingsToFilter.filter((listing) => isDraft(listing));
       }
       if (selectedFilter === 'Expired') {
-        return listingsToFilter.filter(listing => isExpired(listing));
+        return listingsToFilter.filter((listing) => isExpired(listing));
       }
       if (selectedFilter === 'Active') {
-        return listingsToFilter.filter(listing => listing.published === true);
+        return listingsToFilter.filter((listing) => listing.published === true);
       }
       return listingsToFilter;
     };
@@ -84,7 +84,7 @@ export class ListingDashboard extends Component {
         displayedListings = filterListings(userListings, selectedFilter).sort(
           customSort,
         );
-        return displayedListings.map(listing => (
+        return displayedListings.map((listing) => (
           <ListingRow listing={listing} />
         ));
       }
@@ -92,7 +92,7 @@ export class ListingDashboard extends Component {
         organizationListings,
         selectedFilter,
       ).sort(customSort);
-      return displayedListings.map(listing =>
+      return displayedListings.map((listing) =>
         listing.organization_id === selected ? (
           <ListingRow listing={listing} />
         ) : (
@@ -101,17 +101,20 @@ export class ListingDashboard extends Component {
       );
     };
 
-    const setStateOnKeyPress = (event, state) => (event.key === 'Enter' || event.key === ' ') && this.setState(state)
+    const setStateOnKeyPress = (event, state) =>
+      (event.key === 'Enter' || event.key === ' ') && this.setState(state);
 
     const filters = ['All', 'Active', 'Draft', 'Expired'];
-    const filterButtons = filters.map(f => (
+    const filterButtons = filters.map((f) => (
       <span
-        onClick={event => {
+        onClick={(event) => {
           this.setState({ filter: event.target.textContent });
         }}
         className={`rounded-btn ${filter === f ? 'active' : ''}`}
         role="button"
-        onKeyPress={event => setStateOnKeyPress(event, { filter: event.target.textContent })}
+        onKeyPress={(event) =>
+          setStateOnKeyPress(event, { filter: event.target.textContent })
+        }
         tabIndex="0"
       >
         {f}
@@ -122,10 +125,10 @@ export class ListingDashboard extends Component {
       <div className="dashboard-listings-actions">
         <div className="listings-dashboard-filter-buttons">{filterButtons}</div>
         <select
-          onChange={event => {
+          onChange={(event) => {
             this.setState({ sort: event.target.value });
           }}
-          onBlur={event => {
+          onBlur={(event) => {
             this.setState({ sort: event.target.value });
           }}
         >
@@ -137,13 +140,15 @@ export class ListingDashboard extends Component {
       </div>
     );
 
-    const orgButtons = orgs.map(org => (
+    const orgButtons = orgs.map((org) => (
       <span
         onClick={() => this.setState({ selectedListings: org.id })}
         className={`rounded-btn ${selectedListings === org.id ? 'active' : ''}`}
         role="button"
         tabIndex="0"
-        onKeyPress={event => setStateOnKeyPress(event, { selectedListings: org.id })}
+        onKeyPress={(event) =>
+          setStateOnKeyPress(event, { selectedListings: org.id })
+        }
       >
         {org.name}
       </span>
@@ -151,18 +156,13 @@ export class ListingDashboard extends Component {
 
     const listingLength = (selected, userListings, organizationListings) => {
       return selected === 'user' ? (
-        <h4>
-          Listings Made:
-          {' '}
-          {userListings.length}
-        </h4>
+        <h4>Listings Made: {userListings.length}</h4>
       ) : (
         <h4>
-          Listings Made:
-          {' '}
+          Listings Made:{' '}
           {
             organizationListings.filter(
-              listing => listing.organization_id === selected,
+              (listing) => listing.organization_id === selected,
             ).length
           }
         </h4>
@@ -171,16 +171,14 @@ export class ListingDashboard extends Component {
 
     const creditCount = (selected, userCreds, organizations) => {
       return selected === 'user' ? (
-        <h4>
-          Credits Available:
-          {' '}
-          {userCreds}
-        </h4>
+        <h4>Credits Available: {userCreds}</h4>
       ) : (
         <h4>
-          Credits Available:
-          {' '}
-          {organizations.find(org => org.id === selected).unspent_credits_count}
+          Credits Available:{' '}
+          {
+            organizations.find((org) => org.id === selected)
+              .unspent_credits_count
+          }
         </h4>
       );
     };
@@ -194,7 +192,9 @@ export class ListingDashboard extends Component {
           }`}
           role="button"
           tabIndex="0"
-          onKeyPress={event =>setStateOnKeyPress(event, { selectedListings: 'user' })}
+          onKeyPress={(event) =>
+            setStateOnKeyPress(event, { selectedListings: 'user' })
+          }
         >
           Personal
         </span>
diff --git a/app/javascript/listings/listingForm.jsx b/app/javascript/listings/listingForm.jsx
index 1aab59e62..1b4787f6a 100644
--- a/app/javascript/listings/listingForm.jsx
+++ b/app/javascript/listings/listingForm.jsx
@@ -66,7 +66,7 @@ export default class ListingForm extends Component {
         <div className="field">
           <label htmlFor="organizationId">Post under an organization:</label>
           <OrganizationPicker
-            name="classified_listing[organization_id]"
+            name="listing[organization_id]"
             id="listing_organization_id"
             organizations={organizations}
             organizationId={organizationId}
diff --git a/app/javascript/listings/listings.jsx b/app/javascript/listings/listings.jsx
index 2333ac250..fb339a8ea 100644
--- a/app/javascript/listings/listings.jsx
+++ b/app/javascript/listings/listings.jsx
@@ -5,7 +5,7 @@ import ModalBackground from './components/ModalBackground';
 import Modal from './components/Modal';
 import AllListings from './components/AllListings';
 import NextPageButton from './components/NextPageButton';
-import ClassifiedFilters from './components/ClassifiedFilters';
+import ListingFilters from './components/ListingFilters';
 import {
   LISTING_PAGE_SIZE,
   MATCH_LISTING,
@@ -33,7 +33,7 @@ export class Listings extends Component {
 
   componentWillMount() {
     const params = getQueryParams();
-    const container = document.getElementById('classifieds-index-container');
+    const container = document.getElementById('listings-index-container');
     const category = container.dataset.category || '';
     const allCategories = JSON.parse(container.dataset.allcategories || []);
     let tags = [];
@@ -57,10 +57,10 @@ export class Listings extends Component {
       document.body.classList.add('modal-open');
     }
 
-    this.debouncedClassifiedListingSearch = debounceAction(
-      this.handleQuery.bind(this),
-      { time: 150, config: { leading: true } },
-    );
+    this.debouncedListingSearch = debounceAction(this.handleQuery.bind(this), {
+      time: 150,
+      config: { leading: true },
+    });
 
     this.setState({
       query,
@@ -235,7 +235,7 @@ export class Listings extends Component {
   };
 
   /**
-   * Call search API for ClassifiedListings
+   * Call search API for Listings
    *
    * @param {string} query - The search term
    * @param {string} tags - The tags selected by the user
@@ -248,21 +248,21 @@ export class Listings extends Component {
     const { page } = this.state;
     const dataHash = {
       category,
-      classified_listing_search: query,
+      listing_search: query,
       page,
       per_page: LISTING_PAGE_SIZE,
       tags,
       tag_boolean_mode: 'all',
     };
 
-    const responsePromise = fetchSearch('classified_listings', dataHash);
+    const responsePromise = fetchSearch('listings', dataHash);
     return responsePromise.then((response) => {
-      const classifiedListings = response.result;
-      const fullListings = updateListings(classifiedListings);
+      const listings = response.result;
+      const fullListings = updateListings(listings);
       this.setState({
         listings: fullListings,
         initialFetch: false,
-        showNextPageButton: classifiedListings.length === LISTING_PAGE_SIZE,
+        showNextPageButton: listings.length === LISTING_PAGE_SIZE,
       });
       this.setLocation(query, tags, category, slug);
     });
@@ -293,12 +293,12 @@ export class Listings extends Component {
         {shouldRenderModal && (
           <ModalBackground onClick={this.handleCloseModal} />
         )}
-        <ClassifiedFilters
+        <ListingFilters
           categories={allCategories}
           category={category}
           onSelectCategory={this.selectCategory}
           message={message}
-          onKeyUp={this.debouncedClassifiedListingSearch}
+          onKeyUp={this.debouncedListingSearch}
           onClearQuery={this.clearQuery}
           onRemoveTag={this.removeTag}
           tags={tags}
diff --git a/app/javascript/listings/singleListing/AuthorInfo.jsx b/app/javascript/listings/singleListing/AuthorInfo.jsx
index b48012327..1e3a427e9 100644
--- a/app/javascript/listings/singleListing/AuthorInfo.jsx
+++ b/app/javascript/listings/singleListing/AuthorInfo.jsx
@@ -25,17 +25,15 @@ const AuthorInfo = ({ listing, onCategoryClick }) => {
   const { category, location, author = {} } = listing;
   const { username, name } = author;
   return (
-    <div className="single-classified-listing-author-info">
+    <div className="single-listing-author-info">
       <a
         href={`/listings/${category}`}
-        onClick={e => onCategoryClick(e, category)}
+        onClick={(e) => onCategoryClick(e, category)}
         data-no-instant
       >
         {category}
       </a>
-      <LocationText location={location} />
-      ・
-      <a href={`/${username}`}>{name}</a>
+      <LocationText location={location} />・<a href={`/${username}`}>{name}</a>
     </div>
   );
 };
diff --git a/app/javascript/listings/singleListing/DropdownMenu.jsx b/app/javascript/listings/singleListing/DropdownMenu.jsx
index f244bf5ad..47fa8eef8 100644
--- a/app/javascript/listings/singleListing/DropdownMenu.jsx
+++ b/app/javascript/listings/singleListing/DropdownMenu.jsx
@@ -51,7 +51,7 @@ class DropdownMenu extends Component {
       : document.removeEventListener('mousedown', this.handleClickOutside);
   };
 
-  handleClickOutside = e => {
+  handleClickOutside = (e) => {
     if (
       this.componentRef.current &&
       !this.componentRef.current.contains(e.target)
@@ -75,7 +75,7 @@ class DropdownMenu extends Component {
             className={['dropdown-content', isOpen ? 'showing' : ''].join(' ')}
           >
             {isOwner ? (
-              <a href={editUrl} className="classified-listing-edit-button">
+              <a href={editUrl} className="listing-edit-button">
                 Edit
               </a>
             ) : (
diff --git a/app/javascript/listings/singleListing/Header.jsx b/app/javascript/listings/singleListing/Header.jsx
index 25eb83ba0..f2a75e975 100644
--- a/app/javascript/listings/singleListing/Header.jsx
+++ b/app/javascript/listings/singleListing/Header.jsx
@@ -6,11 +6,11 @@ import DropdownMenu from './DropdownMenu';
 const Header = ({ listing, currentUserId, onTitleClick }) => {
   const { id, user_id: userId, category, slug, title } = listing;
   return (
-    <h3 className="single-classified-listing-header">
+    <h3 className="single-listing-header">
       <a
         href={`/listings/${category}/${slug}`}
         data-no-instant
-        onClick={e => onTitleClick(e, listing)}
+        onClick={(e) => onTitleClick(e, listing)}
         data-listing-id={id}
       >
         {title}
diff --git a/app/javascript/listings/singleListing/TagLinks.jsx b/app/javascript/listings/singleListing/TagLinks.jsx
index 86c734536..de11107de 100644
--- a/app/javascript/listings/singleListing/TagLinks.jsx
+++ b/app/javascript/listings/singleListing/TagLinks.jsx
@@ -2,13 +2,13 @@ import PropTypes from 'prop-types';
 import { h } from 'preact';
 
 const TagLinks = ({ tags, onClick }) => (
-  <div className="single-classified-listing-tags">
+  <div className="single-listing-tags">
     {tags.length
-      ? tags.map(tag => {
+      ? tags.map((tag) => {
           return (
             <a
               href={`/listings?t=${tag}`}
-              onClick={e => onClick(e, tag)}
+              onClick={(e) => onClick(e, tag)}
               data-no-instant
             >
               {tag}
diff --git a/app/javascript/listings/singleListing/index.jsx b/app/javascript/listings/singleListing/index.jsx
index 0876b2624..774d74a9c 100644
--- a/app/javascript/listings/singleListing/index.jsx
+++ b/app/javascript/listings/singleListing/index.jsx
@@ -15,14 +15,11 @@ const SingleListing = ({
   isOpen,
 }) => {
   const definedClass = isOpen
-    ? 'single-classified-listing single-classified-listing--opened'
-    : 'single-classified-listing';
+    ? 'single-listing single-listing--opened'
+    : 'single-listing';
 
   return (
-    <div
-      className={definedClass}
-      id={`single-classified-listing-${listing.id}`}
-    >
+    <div className={definedClass} id={`single-listing-${listing.id}`}>
       <div className="listing-content">
         <Header
           listing={listing}
@@ -30,7 +27,7 @@ const SingleListing = ({
           onTitleClick={onOpenModal}
         />
         <div
-          className="single-classified-listing-body"
+          className="single-listing-body"
           dangerouslySetInnerHTML={{ __html: listing.processed_html }} // eslint-disable-line react/no-danger
         />
         <TagLinks tags={listing.tags} onClick={onAddTag} />
diff --git a/app/javascript/listings/utils.js b/app/javascript/listings/utils.js
index 54520915e..0a9683031 100644
--- a/app/javascript/listings/utils.js
+++ b/app/javascript/listings/utils.js
@@ -5,15 +5,15 @@
 export const LISTING_PAGE_SIZE = 75;
 
 export const MATCH_LISTING = [
-  'single-classified-listing-container__inner',
-  'classified-filters',
-  'classified-listings-modal-background',
+  'single-listing-container__inner',
+  'listing-filters',
+  'listings-modal-background',
 ];
 
-export function updateListings(classifiedListings) {
+export function updateListings(listings) {
   const fullListings = [];
 
-  classifiedListings.forEach((listing) => {
+  listings.forEach((listing) => {
     if (listing.bumped_at) {
       fullListings.push(listing);
     }
@@ -40,7 +40,7 @@ export function getQueryParams() {
 
 function resizeMasonryItem(item) {
   /* Get the grid object, its row-gap, and the size of its implicit rows */
-  const grid = document.getElementsByClassName('classifieds-columns')[0];
+  const grid = document.getElementsByClassName('listings-columns')[0];
   const rowGap = parseInt(
     window.getComputedStyle(grid).getPropertyValue('grid-row-gap'),
     10,
@@ -63,7 +63,7 @@ function resizeMasonryItem(item) {
 
 export function resizeAllMasonryItems() {
   // Get all item class objects in one list
-  const allItems = document.getElementsByClassName('single-classified-listing');
+  const allItems = document.getElementsByClassName('single-listing');
 
   /*
    * Loop through the above list and execute the spanning function to
diff --git a/app/javascript/packs/listingDashboard.jsx b/app/javascript/packs/listingDashboard.jsx
index 26f2fdab6..dd9400545 100644
--- a/app/javascript/packs/listingDashboard.jsx
+++ b/app/javascript/packs/listingDashboard.jsx
@@ -2,7 +2,7 @@ import { h, render } from 'preact';
 import { ListingDashboard } from '../listings/listingDashboard';
 
 function loadElement() {
-  const root = document.getElementById('classifieds-listings-dashboard');
+  const root = document.getElementById('listings-dashboard');
   if (root) {
     render(<ListingDashboard />, root, root.firstElementChild);
   }
diff --git a/app/javascript/packs/listings.jsx b/app/javascript/packs/listings.jsx
index 31ff5be47..8bc00fdb6 100644
--- a/app/javascript/packs/listings.jsx
+++ b/app/javascript/packs/listings.jsx
@@ -2,7 +2,7 @@ import { h, render } from 'preact';
 import { Listings } from '../listings/listings';
 
 function loadElement() {
-  const root = document.getElementById('classifieds-index-container');
+  const root = document.getElementById('listings-index-container');
   if (root) {
     render(<Listings />, root, root.firstElementChild);
   }
diff --git a/app/javascript/shared/components/tags.jsx b/app/javascript/shared/components/tags.jsx
index eadd786c7..0f3b07b27 100644
--- a/app/javascript/shared/components/tags.jsx
+++ b/app/javascript/shared/components/tags.jsx
@@ -433,7 +433,7 @@ class Tags extends Component {
             return this.textArea;
           }}
           className={`${classPrefix}__tags`}
-          name="classified_listing[tag_list]"
+          name="listing[tag_list]"
           placeholder={`${maxTags} tags max, comma separated, no spaces or special characters`}
           autoComplete="off"
           value={defaultValue}
diff --git a/app/labor/cache_buster.rb b/app/labor/cache_buster.rb
index c07fca2c4..abdf29163 100644
--- a/app/labor/cache_buster.rb
+++ b/app/labor/cache_buster.rb
@@ -170,15 +170,15 @@ module CacheBuster
     podcast_episode.purge_all
   end
 
-  def self.bust_classified_listings(classified_listing)
+  def self.bust_listings(listing)
     # we purge all listings as it's the wanted behavior with the following URL purging
-    classified_listing.purge_all
+    listing.purge_all
 
     bust("/listings")
     bust("/listings?i=i")
-    bust("/listings/#{classified_listing.category}/#{classified_listing.slug}")
-    bust("/listings/#{classified_listing.category}/#{classified_listing.slug}?i=i")
-    bust("/listings/#{classified_listing.category}")
+    bust("/listings/#{listing.category}/#{listing.slug}")
+    bust("/listings/#{listing.category}/#{listing.slug}?i=i")
+    bust("/listings/#{listing.category}")
   end
 
   def self.bust_user(user)
diff --git a/app/liquid_tags/classified_listing_tag.rb b/app/liquid_tags/listing_tag.rb
similarity index 78%
rename from app/liquid_tags/classified_listing_tag.rb
rename to app/liquid_tags/listing_tag.rb
index 405e8a065..4dbdf29fa 100644
--- a/app/liquid_tags/classified_listing_tag.rb
+++ b/app/liquid_tags/listing_tag.rb
@@ -1,5 +1,5 @@
-class ClassifiedListingTag < LiquidTagBase
-  PARTIAL = "classified_listings/liquid".freeze
+class ListingTag < LiquidTagBase
+  PARTIAL = "listings/liquid".freeze
 
   def initialize(_tag_name, slug_path_url, _tokens)
     stripped_path = ActionController::Base.helpers.strip_tags(slug_path_url).strip
@@ -24,11 +24,11 @@ class ClassifiedListingTag < LiquidTagBase
     hash = get_hash(url)
     raise StandardError, "Invalid URL or slug. Listing not found." if hash.nil?
 
-    listing = ClassifiedListing.in_category(hash[:category]).find_by(slug: hash[:slug])
+    listing = Listing.in_category(hash[:category]).find_by(slug: hash[:slug])
     raise StandardError, "Invalid URL or slug. Listing not found." unless listing
 
     listing
   end
 end
 
-Liquid::Template.register_tag("listing", ClassifiedListingTag)
+Liquid::Template.register_tag("listing", ListingTag)
diff --git a/app/models/classified_listing.rb b/app/models/listing.rb
similarity index 64%
rename from app/models/classified_listing.rb
rename to app/models/listing.rb
index 7aafb27fe..14b729d1a 100644
--- a/app/models/classified_listing.rb
+++ b/app/models/listing.rb
@@ -1,15 +1,18 @@
-class ClassifiedListing < ApplicationRecord
+class Listing < ApplicationRecord
+  # We used to use both "classified listing" and "listing" throughout the app.
+  # We standardized on the latter, but keeping the table name was easier.
+  self.table_name = "classified_listings"
+
   include Searchable
 
-  SEARCH_SERIALIZER = Search::ClassifiedListingSerializer
-  SEARCH_CLASS = Search::ClassifiedListing
+  SEARCH_SERIALIZER = Search::ListingSerializer
+  SEARCH_CLASS = Search::Listing
 
   attr_accessor :action
 
-  # Note: categories were hardcoded at first and this model was only added later,
-  # so the association name is a bit verbose since the original "category" attribute
-  # was kept to minimize code changes.
-  belongs_to :classified_listing_category
+  # Note: categories were hardcoded at first and the model was only added later.
+  # The foreign_key and inverse_of options are used because of legacy table names.
+  belongs_to :listing_category, inverse_of: :listings, foreign_key: :classified_listing_category_id
   belongs_to :user
   belongs_to :organization, optional: true
   before_save :evaluate_markdown
@@ -30,15 +33,25 @@ class ClassifiedListing < ApplicationRecord
   validate :validate_tags
 
   scope :published, -> { where(published: true) }
+
+  # Note: we still need to use the old column name for the join query
   scope :in_category, lambda { |slug|
-    joins(:classified_listing_category).
-      where("classified_listing_categories.slug" => slug)
+    joins(:listing_category).where("classified_listing_categories.slug" => slug)
   }
 
-  delegate :cost, to: :classified_listing_category
+  delegate :cost, to: :listing_category
+
+  # Wrapping the column accessor names for consistency. Aliasing did not work.
+  def listing_category_id
+    classified_listing_category_id
+  end
+
+  def listing_category_id=(id)
+    self.classified_listing_category_id = id
+  end
 
   def category
-    classified_listing_category&.slug
+    listing_category&.slug
   end
 
   def author
@@ -60,7 +73,7 @@ class ClassifiedListing < ApplicationRecord
   end
 
   def modify_inputs
-    ActsAsTaggableOn::Taggable::Cache.included(ClassifiedListing)
+    ActsAsTaggableOn::Taggable::Cache.included(Listing)
     ActsAsTaggableOn.default_parser = ActsAsTaggableOn::TagParser
     self.body_markdown = body_markdown.to_s.gsub(/\r\n/, "\n")
   end
diff --git a/app/models/classified_listing_category.rb b/app/models/listing_category.rb
similarity index 62%
rename from app/models/classified_listing_category.rb
rename to app/models/listing_category.rb
index 1554b5e34..3f53b12b4 100644
--- a/app/models/classified_listing_category.rb
+++ b/app/models/listing_category.rb
@@ -1,5 +1,9 @@
-class ClassifiedListingCategory < ApplicationRecord
-  has_many :classified_listings
+class ListingCategory < ApplicationRecord
+  # We used to use both "classified listing" and "listing" throughout the app.
+  # We standardized on the latter, but keeping the table name was easier.
+  self.table_name = "classified_listing_categories"
+
+  has_many :listings, inverse_of: :listing_category
 
   before_validation :normalize_social_preview_color
 
diff --git a/app/models/organization.rb b/app/models/organization.rb
index 93782f7df..131f9e391 100644
--- a/app/models/organization.rb
+++ b/app/models/organization.rb
@@ -13,7 +13,7 @@ class Organization < ApplicationRecord
 
   has_many :api_secrets, through: :users
   has_many :articles
-  has_many :classified_listings
+  has_many :listings
   has_many :collections
   has_many :credits
   has_many :display_ads
diff --git a/app/models/user.rb b/app/models/user.rb
index 7cb0d7417..d8986ca2b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -59,7 +59,7 @@ class User < ApplicationRecord
   has_many :blocker_blocks, class_name: "UserBlock", foreign_key: :blocker_id, inverse_of: :blocker, dependent: :delete_all
   has_many :chat_channel_memberships, dependent: :destroy
   has_many :chat_channels, through: :chat_channel_memberships
-  has_many :classified_listings, dependent: :destroy
+  has_many :listings, dependent: :destroy
   has_many :collections, dependent: :destroy
   has_many :comments, dependent: :destroy
   has_many :created_podcasts, class_name: "Podcast", foreign_key: :creator_id, inverse_of: :creator, dependent: :nullify
diff --git a/app/policies/classified_listing_policy.rb b/app/policies/listing_policy.rb
similarity index 90%
rename from app/policies/classified_listing_policy.rb
rename to app/policies/listing_policy.rb
index f13e3b11c..b966db1f5 100644
--- a/app/policies/classified_listing_policy.rb
+++ b/app/policies/listing_policy.rb
@@ -1,4 +1,4 @@
-class ClassifiedListingPolicy < ApplicationPolicy
+class ListingPolicy < ApplicationPolicy
   def edit?
     user_is_author? || authorized_organization_admin_editor?
   end
diff --git a/app/serializers/search/classified_listing_author_serializer.rb b/app/serializers/search/listing_author_serializer.rb
similarity index 73%
rename from app/serializers/search/classified_listing_author_serializer.rb
rename to app/serializers/search/listing_author_serializer.rb
index 2c20e4428..7f076d9fd 100644
--- a/app/serializers/search/classified_listing_author_serializer.rb
+++ b/app/serializers/search/listing_author_serializer.rb
@@ -1,5 +1,5 @@
 module Search
-  class ClassifiedListingAuthorSerializer
+  class ListingAuthorSerializer
     include FastJsonapi::ObjectSerializer
 
     attributes :username, :name, :profile_image_90
diff --git a/app/serializers/search/classified_listing_serializer.rb b/app/serializers/search/listing_serializer.rb
similarity index 84%
rename from app/serializers/search/classified_listing_serializer.rb
rename to app/serializers/search/listing_serializer.rb
index 2c546402a..2866da1f3 100644
--- a/app/serializers/search/classified_listing_serializer.rb
+++ b/app/serializers/search/listing_serializer.rb
@@ -1,5 +1,5 @@
 module Search
-  class ClassifiedListingSerializer
+  class ListingSerializer
     include FastJsonapi::ObjectSerializer
 
     attributes :id,
@@ -18,7 +18,7 @@ module Search
     attribute :tags, &:tag_list
 
     attribute :author do |cl|
-      ClassifiedListingAuthorSerializer.new(cl.author).
+      ListingAuthorSerializer.new(cl.author).
         serializable_hash.
         dig(:data, :attributes)
     end
diff --git a/app/services/credits/ledger.rb b/app/services/credits/ledger.rb
index efe281e99..850c26142 100644
--- a/app/services/credits/ledger.rb
+++ b/app/services/credits/ledger.rb
@@ -29,7 +29,7 @@ module Credits
     attr_reader :user
 
     def purchaseable
-      %w[ClassifiedListing]
+      %w[Listing]
     end
 
     def load_credits_purchases(credits)
diff --git a/app/services/search/cluster.rb b/app/services/search/cluster.rb
index 6815b2235..5ba71bb98 100644
--- a/app/services/search/cluster.rb
+++ b/app/services/search/cluster.rb
@@ -2,7 +2,7 @@ module Search
   class Cluster
     SEARCH_CLASSES = [
       Search::ChatChannelMembership,
-      Search::ClassifiedListing,
+      Search::Listing,
       Search::FeedContent,
       Search::Reaction,
       Search::Tag,
diff --git a/app/services/search/classified_listing.rb b/app/services/search/listing.rb
similarity index 70%
rename from app/services/search/classified_listing.rb
rename to app/services/search/listing.rb
index 8a32ebffd..a93d6aaad 100644
--- a/app/services/search/classified_listing.rb
+++ b/app/services/search/listing.rb
@@ -1,8 +1,10 @@
 module Search
-  class ClassifiedListing < Base
+  class Listing < Base
+    # We used to use both "classified listing" and "listing" throughout the app.
+    # We standardized on the latter in most places, but kept the index name here.
     INDEX_NAME = "classified_listings_#{Rails.env}".freeze
     INDEX_ALIAS = "classified_listings_#{Rails.env}_alias".freeze
-    MAPPINGS = JSON.parse(File.read("config/elasticsearch/mappings/classified_listings.json"), symbolize_names: true).freeze
+    MAPPINGS = JSON.parse(File.read("config/elasticsearch/mappings/listings.json"), symbolize_names: true).freeze
     DEFAULT_PAGE = 0
     DEFAULT_PER_PAGE = 75
 
diff --git a/app/services/search/query_builders/classified_listing.rb b/app/services/search/query_builders/listing.rb
similarity index 94%
rename from app/services/search/query_builders/classified_listing.rb
rename to app/services/search/query_builders/listing.rb
index 8cc5c91cf..633eafa06 100644
--- a/app/services/search/query_builders/classified_listing.rb
+++ b/app/services/search/query_builders/listing.rb
@@ -1,6 +1,6 @@
 module Search
   module QueryBuilders
-    class ClassifiedListing < QueryBase
+    class Listing < QueryBase
       TERM_KEYS = %i[
         category
         contact_via_connect
@@ -31,7 +31,7 @@ module Search
       def initialize(params:)
         @params = params.deep_symbolize_keys
 
-        # For now, we're not allowing searches for ClassifiedListings that are
+        # For now, we're not allowing searches for Listings that are
         # not published. If we want to change this in the future we can do:
         # @params[:published] = DEFAULT_PARAMS[:published] unless @params.key?(:published)
         @params[:published] = DEFAULT_PARAMS[:published]
diff --git a/app/services/users/delete_activity.rb b/app/services/users/delete_activity.rb
index 33332ca09..424bfad86 100644
--- a/app/services/users/delete_activity.rb
+++ b/app/services/users/delete_activity.rb
@@ -23,7 +23,7 @@ module Users
       user.poll_votes.delete_all
       user.rating_votes.delete_all
       user.response_templates.delete_all
-      user.classified_listings.destroy_all
+      user.listings.destroy_all
       delete_feedback_messages(user)
     end
 
diff --git a/app/views/api/v0/classified_listings/_listing.json.jbuilder b/app/views/api/v0/classified_listings/_listing.json.jbuilder
deleted file mode 100644
index 944f2da04..000000000
--- a/app/views/api/v0/classified_listings/_listing.json.jbuilder
+++ /dev/null
@@ -1,16 +0,0 @@
-json.type_of "classified_listing"
-
-json.extract!(
-  listing,
-  :id,
-  :title,
-  :slug,
-  :body_markdown,
-  :category,
-  :classified_listing_category_id,
-  :processed_html,
-  :published,
-)
-
-json.tag_list listing.cached_tag_list
-json.tags     listing.tag_list
diff --git a/app/views/api/v0/classified_listings/show.json.jbuilder b/app/views/api/v0/classified_listings/show.json.jbuilder
deleted file mode 100644
index ce5353df9..000000000
--- a/app/views/api/v0/classified_listings/show.json.jbuilder
+++ /dev/null
@@ -1,7 +0,0 @@
-json.partial! "listing", listing: @classified_listing
-
-json.partial! "api/v0/shared/user", user: @classified_listing.user
-
-if @classified_listing.organization
-  json.partial! "api/v0/shared/organization", organization: @classified_listing.organization
-end
diff --git a/app/views/api/v0/listings/_listing.json.jbuilder b/app/views/api/v0/listings/_listing.json.jbuilder
new file mode 100644
index 000000000..f6b0ab88e
--- /dev/null
+++ b/app/views/api/v0/listings/_listing.json.jbuilder
@@ -0,0 +1,16 @@
+json.type_of "listing"
+
+json.extract!(
+  listing,
+  :id,
+  :title,
+  :slug,
+  :body_markdown,
+  :category,
+  :processed_html,
+  :published,
+)
+
+json.listing_category_id listing.classified_listing_category_id
+json.tag_list            listing.cached_tag_list
+json.tags                listing.tag_list
diff --git a/app/views/api/v0/classified_listings/index.json.jbuilder b/app/views/api/v0/listings/index.json.jbuilder
similarity index 82%
rename from app/views/api/v0/classified_listings/index.json.jbuilder
rename to app/views/api/v0/listings/index.json.jbuilder
index 3f6839cdb..15f5781dd 100644
--- a/app/views/api/v0/classified_listings/index.json.jbuilder
+++ b/app/views/api/v0/listings/index.json.jbuilder
@@ -1,4 +1,4 @@
-json.array! @classified_listings do |listing|
+json.array! @listings do |listing|
   json.partial! "listing", listing: listing
   json.partial! "api/v0/shared/user", user: listing.user
 
diff --git a/app/views/api/v0/listings/show.json.jbuilder b/app/views/api/v0/listings/show.json.jbuilder
new file mode 100644
index 000000000..593a41c8f
--- /dev/null
+++ b/app/views/api/v0/listings/show.json.jbuilder
@@ -0,0 +1,7 @@
+json.partial! "listing", listing: @listing
+
+json.partial! "api/v0/shared/user", user: @listing.user
+
+if @listing.organization
+  json.partial! "api/v0/shared/organization", organization: @listing.organization
+end
diff --git a/app/views/articles/_sidebar_additional.html.erb b/app/views/articles/_sidebar_additional.html.erb
index 235bd3763..b02855ea1 100644
--- a/app/views/articles/_sidebar_additional.html.erb
+++ b/app/views/articles/_sidebar_additional.html.erb
@@ -21,14 +21,14 @@
         </div>
       <% end %>
       <%= render "articles/sidebar_campaign" if SiteConfig.campaign_sidebar_enabled? %>
-      <% if params[:timeframe].blank? && @classified_listings.any? %>
+      <% if params[:timeframe].blank? && @listings.any? %>
         <div class="widget" id="sidebar-listings-widget">
           <header class="widget-header-listings">
-            <a href="/listings"><h4>Listings <span class="widget-listing-live-count"><%= @classified_listings.size %></span></h4></a>
+            <a href="/listings"><h4>Listings <span class="widget-listing-live-count"><%= @listings.size %></span></h4></a>
             <button type="button" class="widget-minimize-button" id="sidebar-listings-widget-minimize-button">-</button>
           </header>
           <div class="widget-body widget-body-listings">
-            <% @classified_listings.order("bumped_at DESC").limit(5).each do |listing| %>
+            <% @listings.order("bumped_at DESC").limit(5).each do |listing| %>
               <a class="widget-listing-link" href="<%= listing.path %>">
                 <span class="widget-listing-link-title"><%= listing.title %></span>
                 <span class="widget-listing-link-category"><%= listing.category %></span>
diff --git a/app/views/articles/_sidebar_nav.html.erb b/app/views/articles/_sidebar_nav.html.erb
index 9bb7962fd..c2103d3a3 100644
--- a/app/views/articles/_sidebar_nav.html.erb
+++ b/app/views/articles/_sidebar_nav.html.erb
@@ -28,7 +28,7 @@
         Reading list <span id="reading-list-count" class="crayons-indicator"></span>
       </a>
     <% end %>
-    <a href="<%= classified_listings_path %>" class="crayons-link crayons-link--block">
+    <a href="<%= listings_path %>" class="crayons-link crayons-link--block">
       <%= inline_svg_tag("twemoji/listing.svg", aria: true, class: "crayons-icon crayons-icon--default", title: "Listings") %>
       Listings
     </a>
diff --git a/app/views/classified_listings/_form_errors.html.erb b/app/views/classified_listings/_form_errors.html.erb
deleted file mode 100644
index 246966e49..000000000
--- a/app/views/classified_listings/_form_errors.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<% if classified_listing.errors.any? %>
-  <div class="classified-errors">
-    <h2><%= pluralize(classified_listing.errors.count, "error") %> prohibited this listing from being saved:</h2>
-    <ul>
-    <% classified_listing.errors.full_messages.each do |message| %>
-      <li><%= message %></li>
-    <% end %>
-    </ul>
-  </div>
-<% end %>
diff --git a/app/views/classified_listings/new.html.erb b/app/views/classified_listings/new.html.erb
deleted file mode 100644
index be1d97c50..000000000
--- a/app/views/classified_listings/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% title "New Listing" %>
-
-<div class="classifieds-container classifieds-form-container" id="classifieds-container">
-  <%= render "form", classified_listing: @classified_listing %>
-</div>
diff --git a/app/views/classified_listings/show.html.erb b/app/views/classified_listings/show.html.erb
deleted file mode 100644
index cb8f1cd51..000000000
--- a/app/views/classified_listings/show.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<%= link_to 'Edit', edit_classified_listing_path(@classified_listing) %> |
-<%= link_to 'Back', classified_listings_path %>
diff --git a/app/views/credits/_ledger.html.erb b/app/views/credits/_ledger.html.erb
index 4150f62b0..77dfb400a 100644
--- a/app/views/credits/_ledger.html.erb
+++ b/app/views/credits/_ledger.html.erb
@@ -20,7 +20,7 @@
         <% end %>
           <td>
             <% if item.purchase %>
-              <%= item.purchase.class.name == "ClassifiedListing" ? "Listing" : item.purchase.class.name.titleize %>
+              <%= item.purchase.class.name == "Listing" ? "Listing" : item.purchase.class.name.titleize %>
             <% end %>
           </td>
           <td>
diff --git a/app/views/credits/_ledger_classified_listing.html.erb b/app/views/credits/_ledger_listing.html.erb
similarity index 52%
rename from app/views/credits/_ledger_classified_listing.html.erb
rename to app/views/credits/_ledger_listing.html.erb
index 0084eea14..ce844f14a 100644
--- a/app/views/credits/_ledger_classified_listing.html.erb
+++ b/app/views/credits/_ledger_listing.html.erb
@@ -1,5 +1,5 @@
 <a
-  href="<%= classified_listing_slug_path(purchase.category, purchase.slug) %>"
+  href="<%= listing_slug_path(purchase.category, purchase.slug) %>"
   title="<%= purchase.title %>">
   <%= truncate(purchase.title, length: 20) %>
 </a>
diff --git a/app/views/credits/index.html.erb b/app/views/credits/index.html.erb
index 0459e4aea..fcfe55a1c 100644
--- a/app/views/credits/index.html.erb
+++ b/app/views/credits/index.html.erb
@@ -32,7 +32,7 @@
   <% if @user_unspent_credits_count.positive? %>
     <center>
       <p>
-        <a href="<%= new_classified_listing_path %>">Create a Listing</a>
+        <a href="<%= new_listing_path %>">Create a Listing</a>
       </p>
       <p>
         <a href="/listings/dashboard">Go to Listings Dashboard</a>
diff --git a/app/views/internal/classified_listings/edit.html.erb b/app/views/internal/listings/edit.html.erb
similarity index 53%
rename from app/views/internal/classified_listings/edit.html.erb
rename to app/views/internal/listings/edit.html.erb
index 84605e69a..0754eb277 100644
--- a/app/views/internal/classified_listings/edit.html.erb
+++ b/app/views/internal/listings/edit.html.erb
@@ -1,8 +1,8 @@
 <%= link_to "Back to All Listings", internal_listings_path, class: "btn btn-primary float-right" %>
 
-<h2>Edit <%= link_to @classified_listing.title, "/listings/#{@classified_listing.category}/#{@classified_listing.slug}", target: "_blank", rel: "noopener" %></h2>
+<h2>Edit <%= link_to @listing.title, "/listings/#{@listing.category}/#{@listing.slug}", target: "_blank", rel: "noopener" %></h2>
 
-<%= form_with model: [:internal, @classified_listing], method: :patch do |form| %>
+<%= form_with model: [:internal, @listing], method: :patch do |form| %>
   <div class="form-group">
     <%= form.label :title %>
     <%= form.text_field :title, size: 100, maxlength: 128, class: "form-control" %>
@@ -14,23 +14,23 @@
   <div class="form-group">
     <%= form.label :tag_list %>
     <i style="font-size: 15px;">Comma separated, one space, 8 tags max</i>
-    <%= form.text_field :tag_list, value: @classified_listing.cached_tag_list, size: 100, class: "form-control" %>
+    <%= form.text_field :tag_list, value: @listing.cached_tag_list, size: 100, class: "form-control" %>
   </div>
   <div class="form-group">
-    <%= form.label :classified_listing_category_id %>
-    <%= form.select :classified_listing_category_id, select_options_for_categories %>
+    <%= form.label :listing_category_id %>
+    <%= form.select :listing_category_id, select_options_for_categories %>
   </div>
   <div class="form-check">
-    <%= form.check_box :published, checked: @classified_listing.published? %>
+    <%= form.check_box :published, checked: @listing.published? %>
     <%= form.label :published %>
   </div>
   <%= form.submit "Update Listing", class: "btn btn-primary float-right" %>
 <% end %>
 <hr class="mt-5">
 <div class="d-flex justify-content-start">
-  <%= form_with model: [:internal, @classified_listing], method: :patch do |f| %>
-    <input type="hidden" name="classified_listing[action]" value="bump" />
+  <%= form_with model: [:internal, @listing], method: :patch do |f| %>
+    <input type="hidden" name="listing[action]" value="bump" />
     <%= f.submit "Bump Listing ⏫", class: "btn btn-secondary" %>
   <% end %>
-  <%= link_to "Destroy Listing", url_for(action: :destroy, id: @classified_listing.id), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-danger ml-2" %>
+  <%= link_to "Destroy Listing", url_for(action: :destroy, id: @listing.id), method: :delete, data: { confirm: "Are you sure?" }, class: "btn btn-danger ml-2" %>
 </div>
diff --git a/app/views/internal/classified_listings/index.html.erb b/app/views/internal/listings/index.html.erb
similarity index 96%
rename from app/views/internal/classified_listings/index.html.erb
rename to app/views/internal/listings/index.html.erb
index 2436ed059..8dfaa9ecb 100644
--- a/app/views/internal/classified_listings/index.html.erb
+++ b/app/views/internal/listings/index.html.erb
@@ -26,7 +26,7 @@
   </div>
 </div>
 
-<%= paginate @classified_listings %>
+<%= paginate @listings %>
 
 <table class="table">
   <thead>
@@ -41,7 +41,7 @@
     </tr>
   </thead>
   <tbody>
-    <% @classified_listings.each do |listing| %>
+    <% @listings.each do |listing| %>
       <tr>
         <td><%= link_to listing.title, edit_internal_listing_path(listing.id), target: "_blank", rel: "noopener" %></td>
         <td><%= link_to listing.user.username, edit_internal_user_path(listing.user.id) %></td>
@@ -78,4 +78,4 @@
   </tbody>
 </table>
 
-<%= paginate @classified_listings %>
+<%= paginate @listings %>
diff --git a/app/views/internal/shared/_navbar.html.erb b/app/views/internal/shared/_navbar.html.erb
index d86b313de..184a241f1 100644
--- a/app/views/internal/shared/_navbar.html.erb
+++ b/app/views/internal/shared/_navbar.html.erb
@@ -1,5 +1,5 @@
 <% menu_items = %w[comments articles users tags welcome broadcasts reports response_templates pages tools chat_channels permissions growth mods config events badges organizations sponsorships podcasts negative_reactions moderator_actions].sort.each_with_object({}) { |v, h| h[v] = v } %>
-<% menu_items[:listings] = "classified_listings" %>
+<% menu_items[:listings] = "listings" %>
 <% menu_items[:webhooks] = "webhook_endpoints" %>
 
 <div class="mt-4">
diff --git a/app/views/layouts/_styles.html.erb b/app/views/layouts/_styles.html.erb
index 1098bc52c..40a71996f 100644
--- a/app/views/layouts/_styles.html.erb
+++ b/app/views/layouts/_styles.html.erb
@@ -83,12 +83,12 @@
       <%= Rails.application.assets["article-form-needed-legacy.css"].to_s.html_safe %>
       <%= Rails.application.assets["footer.css"].to_s.html_safe %>
     </style>
-  <% elsif view_class.include? "classified_listings-" %>
+  <% elsif view_class.include? "listings-" %>
     <style>
       <%= Rails.application.assets["crayons.css"].to_s.html_safe %>
       <%= Rails.application.assets["scaffolds.css"].to_s.html_safe %>
       <%= Rails.application.assets["top-bar.css"].to_s.html_safe %>
-      <%= Rails.application.assets["classified_listings.css"].to_s.html_safe %>
+      <%= Rails.application.assets["listings.css"].to_s.html_safe %>
       <%= Rails.application.assets["footer.css"].to_s.html_safe %>
     </style>
   <% elsif view_class.include? "credits-" %>
diff --git a/app/views/classified_listings/_form.html.erb b/app/views/listings/_form.html.erb
similarity index 90%
rename from app/views/classified_listings/_form.html.erb
rename to app/views/listings/_form.html.erb
index b6e167234..0e13039bc 100644
--- a/app/views/classified_listings/_form.html.erb
+++ b/app/views/listings/_form.html.erb
@@ -1,13 +1,13 @@
-<%= form_with(model: classified_listing, local: true) do |form| %>
+<%= form_with(model: listing, local: true) do |form| %>
   <header>
     <a href="/listings/dashboard" class="listings-back-button">&lt; return to listings dashboard</a>
     <h2>Create a Community Listing</h2>
   </header>
-  <div class="classified-form-inner">
-    <%= render partial: "form_errors", locals: { classified_listing: classified_listing } %>
+  <div class="listing-form-inner">
+    <%= render partial: "form_errors", locals: { listing: listing } %>
 
     <div id="listingform-data"
-      data-listing="<%= classified_listing.to_json(only: %i[id title body_markdown category cached_tag_list]) %>"
+      data-listing="<%= listing.to_json(only: %i[id title body_markdown category cached_tag_list]) %>"
       data-organizations="<%= @organizations.to_json(only: %i[id name]) %>"
       data-categories-for-select="<%= select_options_for_categories.to_json %>"
       data-categories-for-details="<%= categories_available.transform_values { |value_hash| value_hash.except(:cost) }.values.to_json %>">
@@ -61,7 +61,7 @@
     <div class="actions">
       <br />
       <p>You will not be charged credits to save a draft.</p>
-      <%= form.button "SAVE DRAFT", type: "submit", name: "classified_listing[action]", class: "cta cta-main-listing-form cta-draft", value: "draft" %>
+      <%= form.button "SAVE DRAFT", type: "submit", name: "listing[action]", class: "cta cta-main-listing-form cta-draft", value: "draft" %>
       <% if @credits.size > 0 || (@organizations.present? && @organizations.sum(:unspent_credits_count) > 0) %>
         <%= form.submit "PUBLISH LISTING", class: "cta cta-main-listing-form" %>
       <% else %>
diff --git a/app/views/listings/_form_errors.html.erb b/app/views/listings/_form_errors.html.erb
new file mode 100644
index 000000000..bf16c6345
--- /dev/null
+++ b/app/views/listings/_form_errors.html.erb
@@ -0,0 +1,10 @@
+<% if listing.errors.any? %>
+  <div class="listing-errors">
+    <h2><%= pluralize(listing.errors.count, "error") %> prohibited this listing from being saved:</h2>
+    <ul>
+    <% listing.errors.full_messages.each do |message| %>
+      <li><%= message %></li>
+    <% end %>
+    </ul>
+  </div>
+<% end %>
diff --git a/app/views/classified_listings/_liquid.html.erb b/app/views/listings/_liquid.html.erb
similarity index 100%
rename from app/views/classified_listings/_liquid.html.erb
rename to app/views/listings/_liquid.html.erb
diff --git a/app/views/classified_listings/dashboard.html.erb b/app/views/listings/dashboard.html.erb
similarity index 89%
rename from app/views/classified_listings/dashboard.html.erb
rename to app/views/listings/dashboard.html.erb
index 4b802c1a8..61b4155b7 100644
--- a/app/views/classified_listings/dashboard.html.erb
+++ b/app/views/listings/dashboard.html.erb
@@ -1,6 +1,6 @@
 <% title "Listings Dashboard" %>
 
-<div id="classifieds-listings-dashboard" data-listings="<%= @classified_listings.to_json(
+<div id="listings-dashboard" data-listings="<%= @listings.to_json(
   only: %i[title tag_list created_at expires_at bumped_at updated_at category id user_id slug organization_id location published],
   include: {
     author: { only: %i[username name], methods: %i[username profile_image_90] },
diff --git a/app/views/classified_listings/delete_confirm.html.erb b/app/views/listings/delete_confirm.html.erb
similarity index 53%
rename from app/views/classified_listings/delete_confirm.html.erb
rename to app/views/listings/delete_confirm.html.erb
index 14cc6a4cb..0ec554198 100644
--- a/app/views/classified_listings/delete_confirm.html.erb
+++ b/app/views/listings/delete_confirm.html.erb
@@ -1,18 +1,18 @@
 <%= javascript_include_tag "application" %>
 
 <div class="container delete-confirm">
-  <h4><%= @classified_listing.title %></h4>
+  <h4><%= @listing.title %></h4>
   <h1>Are you sure you want to delete this listing?</h1>
 
   <h2>
     You cannot undo this action, perhaps you just want to
-    <a data-no-instant href="/listings/<%= @classified_listing.id %>/edit">
-      <%= @classified_listing.published ? "unpublish" : "edit" %>
+    <a data-no-instant href="/listings/<%= @listing.id %>/edit">
+      <%= @listing.published ? "unpublish" : "edit" %>
     </a>
     instead?
   </h2>
 
-  <%= form_tag "/listings/#{@classified_listing.id}", method: :delete do %>
+  <%= form_tag "/listings/#{@listing.id}", method: :delete do %>
     <button class="cta">DELETE</button>
   <% end %>
 </div>
diff --git a/app/views/classified_listings/edit.html.erb b/app/views/listings/edit.html.erb
similarity index 52%
rename from app/views/classified_listings/edit.html.erb
rename to app/views/listings/edit.html.erb
index e6b2d64a1..c45624d34 100644
--- a/app/views/classified_listings/edit.html.erb
+++ b/app/views/listings/edit.html.erb
@@ -1,15 +1,15 @@
 <% title "Edit Listing" %>
 
-<div class="classifieds-container classifieds-form-container">
-  <%= form_for(@classified_listing) do |f| %>
+<div class="listings-container listings-form-container">
+  <%= form_for(@listing) do |f| %>
     <header>
       <a href="/listings/dashboard" class="listings-back-button">&lt; return to listings dashboard</a>
       <h2>You can only edit title/body/tags of drafts or within the first 24 hours of listing or bumping</h2>
     </header>
-    <div class="classified-form-inner">
-      <%= render partial: "form_errors", locals: { classified_listing: @classified_listing } %>
+    <div class="listings-form-inner">
+      <%= render partial: "form_errors", locals: { listing: @listing } %>
 
-      <% if (@classified_listing.bumped_at && @classified_listing.bumped_at > 24.hours.ago) || @classified_listing.updated_at && !@classified_listing.published %>
+      <% if (@listing.bumped_at && @listing.bumped_at > 24.hours.ago) || @listing.updated_at && !@listing.published %>
         <div class="field">
           <%= f.label "title", "Title" %>
           <%= f.text_field "title", maxlength: 128, placeholder: "128 characters max, plain text" %>
@@ -20,7 +20,7 @@
         </div>
         <div class="field">
           <%= f.label "tag_list", "Tags" %>
-          <%= f.text_field "tag_list", value: @classified_listing.cached_tag_list, placeholder: "8 tags max, comma separated, no spaces or special characters" %>
+          <%= f.text_field "tag_list", value: @listing.cached_tag_list, placeholder: "8 tags max, comma separated, no spaces or special characters" %>
         </div>
         <div class="field">
           <%= f.label "location", "Location" %>
@@ -28,13 +28,13 @@
         </div>
         <div class="field">
           <%= f.label "expires_at", "Custom Expire Date" %>
-          <%= f.date_field "expires_at", min: Date.tomorrow, max: @classified_listing.natural_expiration_date %>
+          <%= f.date_field "expires_at", min: Date.tomorrow, max: @listing.natural_expiration_date %>
         </div>
         <div class="field">
           <%= f.label "contact_via_connect", "Allow Users to Message Me Via In-App Chat (#{community_name} Connect)" %>
           <%= f.check_box "contact_via_connect" %>
         </div>
-        <% if @classified_listing.published %>
+        <% if @listing.published %>
           <%= f.submit "Update Listings Info", class: "cta cta-main-listing-form" %>
         <% else %>
           <%= f.submit "Update Draft", class: "cta cta-main-listing-form cta-draft" %>
@@ -42,40 +42,40 @@
       <% end %>
     </div>
   <% end %>
-  <% if @classified_listing.bumped_at %>
-    <%= form_for(@classified_listing) do |f| %>
+  <% if @listing.bumped_at %>
+    <%= form_for(@listing) do |f| %>
       <header>
-        <a href="<%= @classified_listing.path %>" class="listings-back-button" style="font-size: 1.1em;">Last Published/Bumped: <%= time_ago_in_words @classified_listing.bumped_at %> ago</a>
+        <a href="<%= @listing.path %>" class="listings-back-button" style="font-size: 1.1em;">Last Published/Bumped: <%= time_ago_in_words @listing.bumped_at %> ago</a>
         <h2>You can bump your listing for the same price as the original listing</h2>
       </header>
-      <div class="classified-form-inner">
-        <% if (@classified_listing.natural_expiration_date) < Date.today %>
+      <div class="listing-form-inner">
+        <% if (@listing.natural_expiration_date) < Date.today %>
           <h4>
-            (Expired <%= time_ago_in_words @classified_listing.natural_expiration_date %> ago)
+            (Expired <%= time_ago_in_words @listing.natural_expiration_date %> ago)
           </h4>
         <% else %>
           <h4>
-            (Expires in <%= time_ago_in_words @classified_listing.natural_expiration_date %>)
+            (Expires in <%= time_ago_in_words @listing.natural_expiration_date %>)
           </h4>
         <% end %>
-        <input type="hidden" name="classified_listing[action]" value="bump" />
+        <input type="hidden" name="listing[action]" value="bump" />
         <%= f.submit "Bump Listing", class: "cta cta-main-listing-form" %>
       </div>
     <% end %>
   <% end %>
-  <%= form_for(@classified_listing) do |f| %>
-    <div class="classified-form-inner">
-      <% unless @classified_listing.published %>
+  <%= form_for(@listing) do |f| %>
+    <div class="listing-form-inner">
+      <% unless @listing.published %>
         <h2 style="text-align: center; margin-top: 15px;">
           This listing is not published
         </h2>
       <% end %>
-      <% if @classified_listing.published == false %>
-        <input type="hidden" name="classified_listing[action]" value="publish" />
-        <%= f.submit "Publish Listing", class: "cta classified-listings-publish cta-main-listing-form" %>
+      <% if @listing.published == false %>
+        <input type="hidden" name="listing[action]" value="publish" />
+        <%= f.submit "Publish Listing", class: "cta listings-publish cta-main-listing-form" %>
       <% else %>
-        <input type="hidden" name="classified_listing[action]" value="unpublish" />
-        <%= f.submit "Unpublish Listing", class: "cta classified-listings-unpublish cta-main-listing-form" %>
+        <input type="hidden" name="listing[action]" value="unpublish" />
+        <%= f.submit "Unpublish Listing", class: "cta listings-unpublish cta-main-listing-form" %>
       <% end %>
     </div>
   <% end %>
diff --git a/app/views/classified_listings/index.html.erb b/app/views/listings/index.html.erb
similarity index 65%
rename from app/views/classified_listings/index.html.erb
rename to app/views/listings/index.html.erb
index f27992e2e..e1679478e 100644
--- a/app/views/classified_listings/index.html.erb
+++ b/app/views/listings/index.html.erb
@@ -7,13 +7,13 @@
   <meta property="og:type" content="website" />
   <meta property="og:url" content="<%= app_url(request.path) %>" />
   <meta property="og:site_name" content="<%= community_qualified_name %>" />
-  <% if @displayed_classified_listing %>
-    <meta property="og:title" content="<%= truncate @displayed_classified_listing.title, length: 54 %>">
+  <% if @displayed_listing %>
+    <meta property="og:title" content="<%= truncate @displayed_listing.title, length: 54 %>">
     <meta property="og:description" content="<%= community_name %> Listing" />
-    <meta property="og:image" content="<%= listing_social_image_url @displayed_classified_listing %>">
-    <meta name="twitter:title" content="<%= truncate @displayed_classified_listing.title, length: 54 %>">
+    <meta property="og:image" content="<%= listing_social_image_url @displayed_listing %>">
+    <meta name="twitter:title" content="<%= truncate @displayed_listing.title, length: 54 %>">
     <meta name="twitter:description" content="<%= community_name %> Listing">
-    <meta name="twitter:image:src" content="<%= listing_social_image_url @displayed_classified_listing %>">
+    <meta name="twitter:image:src" content="<%= listing_social_image_url @displayed_listing %>">
   <% else %>
     <meta property="og:title" content="Listings" />
     <meta property="og:description" content="<%= SiteConfig.community_description %>" />
@@ -27,22 +27,22 @@
 <% end %>
 
 <div class="home">
-  <div class="classifieds-container" id="classifieds-index-container"
+  <div class="listings-container" id="listings-index-container"
     data-category="<%= params[:category] %>" data-listings="<%= @listings_json %>"
     data-allcategories="<%= categories_for_display.to_json %>"
-    <% if @displayed_classified_listing %>
+    <% if @displayed_listing %>
       data-displayedlisting="<%= @displayed_listing_json %> "
     <% end %>>
 
-    <div class="classified-filters">
-    <div class="classified-filters-categories">
-      <a href="<%= classified_listings_path %>" class="<%= "selected" if params[:category].blank? %> data-no-instant=" true ">all</a>
+    <div class="listing-filters">
+    <div class="listing-filters-categories">
+      <a href="<%= listings_path %>" class="<%= "selected" if params[:category].blank? %> data-no-instant=" true ">all</a>
       <% categories_for_display.each do |cat| %>
-        <a href="<%= classified_listing_category_path(category: cat[:slug]) %>" class="<%= "selected" if params[:category] == cat[:slug] %> data-no-instant="true"><%= cat[:name] %></a>
+        <a href="<%= listing_category_path(category: cat[:slug]) %>" class="<%= "selected" if params[:category] == cat[:slug] %> data-no-instant="true"><%= cat[:name] %></a>
       <% end %>
-      <a href="<%= new_classified_listing_path %>" class='classified-create-link'>Create a Listing</a>
-      <% if @displayed_classified_listing %>
-        <div class="classified-listings-modal-background" role='presentation'></div>
+      <a href="<%= new_listing_path %>" class='listing-create-link'>Create a Listing</a>
+      <% if @displayed_listing %>
+        <div class="listing-listings-modal-background" role='presentation'></div>
       <% end %>
     </div>
   </div>
diff --git a/app/views/listings/new.html.erb b/app/views/listings/new.html.erb
new file mode 100644
index 000000000..72b0d9c3b
--- /dev/null
+++ b/app/views/listings/new.html.erb
@@ -0,0 +1,5 @@
+<% title "New Listing" %>
+
+<div class="listings-container listings-form-container" id="listings-container">
+  <%= render "form", listing: @listing %>
+</div>
diff --git a/app/views/listings/show.html.erb b/app/views/listings/show.html.erb
new file mode 100644
index 000000000..ca1289870
--- /dev/null
+++ b/app/views/listings/show.html.erb
@@ -0,0 +1,4 @@
+<p id="notice"><%= notice %></p>
+
+<%= link_to 'Edit', edit_listing_path(@listing) %> |
+<%= link_to 'Back', listings_path %>
diff --git a/app/views/mailers/notify_mailer/new_badge_email.html.erb b/app/views/mailers/notify_mailer/new_badge_email.html.erb
index e1abf4485..1e44eec7a 100644
--- a/app/views/mailers/notify_mailer/new_badge_email.html.erb
+++ b/app/views/mailers/notify_mailer/new_badge_email.html.erb
@@ -27,7 +27,7 @@
   </p>
   <hr style="opacity:0.4;width: 150px;margin: 30px auto;" />
   <p>
-    You also get <strong><a href="<%= credits_url %>">5 new credits</a></strong> to use for <strong><a href="<%= classified_listings_url %>">community listings</a></strong><br />
+    You also get <strong><a href="<%= credits_url %>">5 new credits</a></strong> to use for <strong><a href="<%= listings_url %>">community listings</a></strong><br />
     if you have anything you'd like to promote. 🎉
   </p>
   <p>
diff --git a/app/views/mailers/notify_mailer/new_badge_email.text.erb b/app/views/mailers/notify_mailer/new_badge_email.text.erb
index 36f074f17..998281ffb 100644
--- a/app/views/mailers/notify_mailer/new_badge_email.text.erb
+++ b/app/views/mailers/notify_mailer/new_badge_email.text.erb
@@ -6,7 +6,7 @@ Congratulations, <%= @user.name %>! You got the <%= @badge.title %> badge! Be su
 
 <%= user_url(@user) %>
 
-You also get 5 new credits to use for community listings if you have anything you'd like to promote: <%= classified_listings_url %>
+You also get 5 new credits to use for community listings if you have anything you'd like to promote: <%= listings_url %>
 
 To manage your credits: visit: <%= credits_url %>
 
diff --git a/app/views/service_worker/index.js.erb b/app/views/service_worker/index.js.erb
index bc5bc9518..e2a3f7f45 100644
--- a/app/views/service_worker/index.js.erb
+++ b/app/views/service_worker/index.js.erb
@@ -127,7 +127,7 @@
         // Don't run on search endpoints
         !url.href.includes('/search/tags') &&
         !url.href.includes('/search/chat_channels') &&
-        !url.href.includes('/search/classified_listings') &&
+        !url.href.includes('/search/listings') &&
         !url.href.includes('/search/reactions') &&
         !url.href.includes('/search/feed_content') &&
         !url.href.includes('/search/users') &&
diff --git a/app/workers/classified_listings/bust_cache_worker.rb b/app/workers/classified_listings/bust_cache_worker.rb
deleted file mode 100644
index 2d589a2e4..000000000
--- a/app/workers/classified_listings/bust_cache_worker.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module ClassifiedListings
-  class BustCacheWorker < BustCacheBaseWorker
-    def perform(classified_listing_id)
-      classified_listing = ClassifiedListing.find_by(id: classified_listing_id)
-      return unless classified_listing
-
-      CacheBuster.bust_classified_listings(classified_listing)
-    end
-  end
-end
diff --git a/app/workers/listings/bust_cache_worker.rb b/app/workers/listings/bust_cache_worker.rb
new file mode 100644
index 000000000..bc8279820
--- /dev/null
+++ b/app/workers/listings/bust_cache_worker.rb
@@ -0,0 +1,10 @@
+module Listings
+  class BustCacheWorker < BustCacheBaseWorker
+    def perform(listing_id)
+      listing = Listing.find_by(id: listing_id)
+      return unless listing
+
+      CacheBuster.bust_listings(listing)
+    end
+  end
+end
diff --git a/app/workers/metrics/record_data_counts_worker.rb b/app/workers/metrics/record_data_counts_worker.rb
index 835d5aebe..030504713 100644
--- a/app/workers/metrics/record_data_counts_worker.rb
+++ b/app/workers/metrics/record_data_counts_worker.rb
@@ -4,7 +4,7 @@ module Metrics
     sidekiq_options queue: :low_priority, retry: 10
 
     def perform
-      models = [User, Article, Organization, Comment, Podcast, PodcastEpisode, ClassifiedListing, PageView, Notification]
+      models = [User, Article, Organization, Comment, Podcast, PodcastEpisode, Listing, PageView, Notification]
       models.each do |model|
         db_count = begin
                      model.count
diff --git a/config/elasticsearch/mappings/classified_listings.json b/config/elasticsearch/mappings/listings.json
similarity index 100%
rename from config/elasticsearch/mappings/classified_listings.json
rename to config/elasticsearch/mappings/listings.json
diff --git a/config/routes.rb b/config/routes.rb
index a08142413..a06adafca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,9 +48,7 @@ Rails.application.routes.draw do
     resources :articles, only: %i[index show update]
     resources :broadcasts, only: %i[index new create edit update]
     resources :buffer_updates, only: %i[create update]
-    # TODO: [mkohl] Change this to a single resource definition
-    resources :classified_listings, only: %i[index edit update destroy]
-    resources :listings, only: %i[index edit update destroy], controller: "classified_listings"
+    resources :listings, only: %i[index edit update destroy]
     resources :comments, only: [:index]
     resources :events, only: %i[index create update]
     resources :feedback_messages, only: %i[index show]
@@ -139,8 +137,8 @@ Rails.application.routes.draw do
       end
       resources :webhooks, only: %i[index create show destroy]
 
-      resources :classified_listings, path: :listings, only: %i[index show create update]
-      get "/listings/category/:category", to: "classified_listings#index", as: :classified_listings_category
+      resources :listings, only: %i[index show create update]
+      get "/listings/category/:category", to: "listings#index", as: :listings_category
       get "/analytics/totals", to: "analytics#totals"
       get "/analytics/historical", to: "analytics#historical"
       get "/analytics/past_day", to: "analytics#past_day"
@@ -212,7 +210,7 @@ Rails.application.routes.draw do
   resources :tag_adjustments, only: %i[create destroy]
   resources :rating_votes, only: [:create]
   resources :page_views, only: %i[create update]
-  resources :classified_listings, path: :listings, only: %i[index new create edit update destroy dashboard]
+  resources :listings, only: %i[index new create edit update destroy dashboard]
   resources :credits, only: %i[index new create] do
     get "purchase", on: :collection, to: "credits#new"
   end
@@ -240,18 +238,18 @@ Rails.application.routes.draw do
   get "/verify_email_ownership", to: "email_authorizations#verify", as: :verify_email_authorizations
   get "/search/tags" => "search#tags"
   get "/search/chat_channels" => "search#chat_channels"
-  get "/search/classified_listings" => "search#classified_listings"
+  get "/search/listings" => "search#listings"
   get "/search/users" => "search#users"
   get "/search/feed_content" => "search#feed_content"
   get "/search/reactions" => "search#reactions"
   get "/chat_channel_memberships/find_by_chat_channel_id" => "chat_channel_memberships#find_by_chat_channel_id"
-  get "/listings/dashboard" => "classified_listings#dashboard"
-  get "/listings/:category" => "classified_listings#index", :as => :classified_listing_category
-  get "/listings/:category/:slug" => "classified_listings#index", :as => :classified_listing_slug
-  get "/listings/:category/:slug/:view" => "classified_listings#index",
+  get "/listings/dashboard" => "listings#dashboard"
+  get "/listings/:category" => "listings#index", :as => :listing_category
+  get "/listings/:category/:slug" => "listings#index", :as => :listing_slug
+  get "/listings/:category/:slug/:view" => "listings#index",
       :constraints => { view: /moderate/ }
-  get "/listings/:category/:slug/delete_confirm" => "classified_listings#delete_confirm"
-  delete "/listings/:category/:slug" => "classified_listings#destroy"
+  get "/listings/:category/:slug/delete_confirm" => "listings#delete_confirm"
+  delete "/listings/:category/:slug" => "listings#destroy"
   get "/notifications/:filter" => "notifications#index"
   get "/notifications/:filter/:org_id" => "notifications#index"
   get "/notification_subscriptions/:notifiable_type/:notifiable_id" => "notification_subscriptions#show"
diff --git a/db/seeds.rb b/db/seeds.rb
index ffb7ea644..84b63f051 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -372,7 +372,7 @@ end
 ##############################################################################
 
 counter += 1
-Rails.logger.info "#{counter}. Creating Classified Listing Categories"
+Rails.logger.info "#{counter}. Creating Listing Categories"
 
 CATEGORIES = [
   {
@@ -413,28 +413,28 @@ CATEGORIES = [
   },
 ].freeze
 
-CATEGORIES.each { |attributes| ClassifiedListingCategory.create(attributes) }
+CATEGORIES.each { |attributes| ListingCategory.create(attributes) }
 
 ##############################################################################
 
 counter += 1
-Rails.logger.info "#{counter}. Creating Classified Listings"
+Rails.logger.info "#{counter}. Creating Listings"
 
 users_in_random_order.each { |user| Credit.add_to(user, rand(100)) }
 users = users_in_random_order.to_a
 
-listings_categories = ClassifiedListingCategory.pluck(:id)
+listings_categories = ListingCategory.pluck(:id)
 listings_categories.each.with_index(1) do |category_id, index|
   # rotate users if they are less than the categories
   user = users.at(index % users.length)
   2.times do
-    ClassifiedListing.create!(
+    Listing.create!(
       user: user,
       title: Faker::Lorem.sentence,
       body_markdown: Faker::Markdown.random,
       location: Faker::Address.city,
       organization_id: user.organizations.first&.id,
-      classified_listing_category_id: category_id,
+      listing_category_id: category_id,
       contact_via_connect: true,
       published: true,
       bumped_at: Time.current,
diff --git a/docs/api_v0.yml b/docs/api_v0.yml
index 6fe1dbdfd..2b9aff2a4 100644
--- a/docs/api_v0.yml
+++ b/docs/api_v0.yml
@@ -691,7 +691,7 @@ components:
     ListingCreate:
       type: object
       properties:
-        classified_listing:
+        listing:
           type: object
           required:
             - title
@@ -748,7 +748,7 @@ components:
     ListingUpdate:
       type: object
       properties:
-        classified_listing:
+        listing:
           type: object
           properties:
             title:
@@ -1394,7 +1394,7 @@ components:
 
     Listings:
       value:
-        - type_of: classified_listing
+        - type_of: listing
           id: 1157
           title: TestBash Detroit
           slug: testbash-detroit-50gb
@@ -1421,7 +1421,7 @@ components:
             profile_image_90: https://res.cloudinary.com/practicaldev/image/fetch/s--CjladMBD--/c_fill,f_auto,fl_progressive,h_90,q_auto,w_90/https://dev-to-uploads.s3.amazonaws.com/uploads/user/profile_image/136256/11cced64-afd2-4421-91e1-c5f7b216d49b.jpeg
     Listing:
       value:
-        type_of: classified_listing
+        type_of: listing
         id: 1157
         title: TestBash Detroit
         slug: testbash-detroit-50gb
@@ -1448,7 +1448,7 @@ components:
           profile_image_90: https://res.cloudinary.com/practicaldev/image/fetch/s--CjladMBD--/c_fill,f_auto,fl_progressive,h_90,q_auto,w_90/https://dev-to-uploads.s3.amazonaws.com/uploads/user/profile_image/136256/11cced64-afd2-4421-91e1-c5f7b216d49b.jpeg
     ListingCreate:
       value:
-        classified_listing:
+        listing:
           title: ACME Conference
           body_markdown: Awesome conference
           category: cfp
@@ -1456,7 +1456,7 @@ components:
           - events
     ListingCreateOrganization:
       value:
-        classified_listing:
+        listing:
           title: ACME Conference
           body_markdown: Awesome conference
           category: cfp
@@ -1465,20 +1465,20 @@ components:
           organization_id: 1
     ListingUpdate:
       value:
-        classified_listing:
+        listing:
           title: ACME New Conference
           body_markdown: Awesome new conference
     ListingUpdateActionBump:
       value:
-        classified_listing:
+        listing:
           action: bump
     ListingUpdateActionPublish:
       value:
-        classified_listing:
+        listing:
           action: publish
     ListingUpdateActionUnpublish:
       value:
-        classified_listing:
+        listing:
           action: unpublish
 
     PodcastEpisodes:
@@ -2358,7 +2358,7 @@ paths:
 
         ### Additional resources
 
-        - [Rails tests for Listings API](https://github.com/thepracticaldev/dev.to/blob/master/spec/requests/api/v0/classified_listings_spec.rb)
+        - [Rails tests for Listings API](https://github.com/thepracticaldev/dev.to/blob/master/spec/requests/api/v0/listings_spec.rb)
       tags:
         - listings
       requestBody:
@@ -2427,21 +2427,21 @@ paths:
           source: |
             curl -X POST -H "Content-Type: application/json" \
               -H "api-key: API_KEY" \
-              -d '{"classified_listing":{"title":"Title","body_markdown":"Body","category":"cfp"}}' \
+              -d '{"listing":{"title":"Title","body_markdown":"Body","category":"cfp"}}' \
               https://dev.to/api/listings
         - lang: Shell
           label: curl (with tags)
           source: |
             curl -X POST -H "Content-Type: application/json" \
               -H "api-key: API_KEY" \
-              -d '{"classified_listing":{"title":"Title","body_markdown":"Body","category":"cfp","tags":["python"]}}' \
+              -d '{"listing":{"title":"Title","body_markdown":"Body","category":"cfp","tags":["python"]}}' \
               https://dev.to/api/listings
         - lang: Shell
           label: curl (draft)
           source: |
             curl -X POST -H "Content-Type: application/json" \
               -H "api-key: API_KEY" \
-              -d '{"classified_listing":{"title":"Title","body_markdown":"Body","category":"cfp","action":"draft"}}' \
+              -d '{"listing":{"title":"Title","body_markdown":"Body","category":"cfp","action":"draft"}}' \
               https://dev.to/api/listings
 
   /listings/category/{category}:
@@ -2626,14 +2626,14 @@ paths:
           source: |
             curl -X PUT -H "Content-Type: application/json" \
               -H "api-key: API_KEY" \
-              -d '{"classified_listing":{"action":"bump"}' \
+              -d '{"listing":{"action":"bump"}' \
               https://dev.to/api/listings/{id}
         - lang: Shell
           label: curl (update)
           source: |
             curl -X PUT -H "Content-Type: application/json" \
               -H "api-key: API_KEY" \
-              -d '{"classified_listing":{"title":"Title"}' \
+              -d '{"listing":{"title":"Title"}' \
               https://dev.to/api/listings/{id}
 
   /podcast_episodes:
diff --git a/docs/backend/elasticsearch.md b/docs/backend/elasticsearch.md
index d1b88f401..c84013f95 100644
--- a/docs/backend/elasticsearch.md
+++ b/docs/backend/elasticsearch.md
@@ -17,7 +17,7 @@ At DEV we use Elasticsearch for all of our user-facing searching needs. Models
 that are searched using Elasticsearch are:
 
 - Tags
-- Classified Listings
+- Listings
 - Chat Channels
 - Users
 - Podcast Episodes
@@ -31,7 +31,7 @@ The above models are organized in Elasticsearch in different
 searching more accurate and performant. The index breakdown is:
 
 - Tags index -> Tags
-- Classified Listings index -> Classified Listings
+- Listings index -> Listings
 - Chat Channel Membership index -> Chat Channels
 - User's index -> Users
 - Feed Content index -> Podcast Episodes, Comments, and Articles
diff --git a/docs/technical-overview/architecture.md b/docs/technical-overview/architecture.md
index d4ffdca6f..5742ab168 100644
--- a/docs/technical-overview/architecture.md
+++ b/docs/technical-overview/architecture.md
@@ -135,11 +135,11 @@ Some tags behave as "flare," highlighting certain articles when viewed from the
 index page. Tags that act as "flare" are defined in the `FlareTag` object. In
 cases of multiple flare tags, the tag displayed is determined by its hierarchy.
 
-## ClassifiedListings (or listings)
+## Listings
 
-Classified listings are similar to posts in some ways, but with more
-limitations. They are designed to be categorized into market areas. They also
-make use of tags.
+Listings are classified ads. They are similar to posts in some ways, but with
+ore limitations. They are designed to be categorized into market areas. They
+also make use of tags.
 
 ## Credits
 
diff --git a/lib/data_update_scripts/20200217215802_index_classified_listings_to_elasticsearch.rb b/lib/data_update_scripts/20200217215802_index_listings_to_elasticsearch.rb
similarity index 56%
rename from lib/data_update_scripts/20200217215802_index_classified_listings_to_elasticsearch.rb
rename to lib/data_update_scripts/20200217215802_index_listings_to_elasticsearch.rb
index e652454e3..96b2cfecd 100644
--- a/lib/data_update_scripts/20200217215802_index_classified_listings_to_elasticsearch.rb
+++ b/lib/data_update_scripts/20200217215802_index_listings_to_elasticsearch.rb
@@ -1,9 +1,9 @@
 module DataUpdateScripts
-  class IndexClassifiedListingsToElasticsearch
+  class IndexListingsToElasticsearch
     def run
       # Choose to do inline so development envs are ready immediately after
       # this is run
-      ClassifiedListing.find_each(&:index_to_elasticsearch_inline)
+      Listing.find_each(&:index_to_elasticsearch_inline)
     end
   end
 end
diff --git a/lib/tasks/fetch.rake b/lib/tasks/fetch.rake
index 9f1f2f0e7..bfa7068b7 100644
--- a/lib/tasks/fetch.rake
+++ b/lib/tasks/fetch.rake
@@ -17,10 +17,10 @@ task resave_supported_tags: :environment do
 end
 
 task expire_old_listings: :environment do
-  ClassifiedListing.where("bumped_at < ?", 30.days.ago).each do |listing|
+  Listing.where("bumped_at < ?", 30.days.ago).each do |listing|
     listing.update(published: false)
   end
-  ClassifiedListing.where("expires_at = ?", Time.zone.today).each do |listing|
+  Listing.where("expires_at = ?", Time.zone.today).each do |listing|
     listing.update(published: false)
   end
 end
diff --git a/spec/decorators/classified_listing_decorator_spec.rb b/spec/decorators/listing_decorator_spec.rb
similarity index 81%
rename from spec/decorators/classified_listing_decorator_spec.rb
rename to spec/decorators/listing_decorator_spec.rb
index 071ba5bbd..96b40e717 100644
--- a/spec/decorators/classified_listing_decorator_spec.rb
+++ b/spec/decorators/listing_decorator_spec.rb
@@ -1,9 +1,9 @@
 require "rails_helper"
 
-RSpec.describe ClassifiedListingDecorator, type: :decorator do
-  let_it_be_readonly(:category) { create(:classified_listing_category) }
+RSpec.describe ListingDecorator, type: :decorator do
+  let_it_be_readonly(:category) { create(:listing_category) }
   let(:decorated_listing) do
-    build(:classified_listing, classified_listing_category: category).decorate
+    build(:listing, listing_category: category).decorate
   end
 
   describe "#social_preview_category" do
@@ -24,7 +24,7 @@ RSpec.describe ClassifiedListingDecorator, type: :decorator do
       allow(category).to receive(:social_preview_color).and_return(nil)
 
       expect(decorated_listing.social_preview_color).
-        to eq(ClassifiedListingDecorator::DEFAULT_COLOR)
+        to eq(ListingDecorator::DEFAULT_COLOR)
     end
 
     it "returns the category's social preview color if available" do
diff --git a/spec/factories/classified_listings.rb b/spec/factories/classified_listings.rb
deleted file mode 100644
index 0df205968..000000000
--- a/spec/factories/classified_listings.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-FactoryBot.define do
-  factory :classified_listing do
-    user
-    title { Faker::Book.title + " #{rand(1000)}" }
-    body_markdown { Faker::Hipster.paragraph(sentence_count: 2) }
-    published { true }
-    bumped_at { Time.current }
-
-    after(:build) do |cl|
-      if cl.classified_listing_category_id.blank?
-        category = ClassifiedListingCategory.first || create(:classified_listing_category)
-        cl.classified_listing_category_id = category.id
-      end
-    end
-  end
-end
diff --git a/spec/factories/classified_listing_categories.rb b/spec/factories/listing_categories.rb
similarity index 93%
rename from spec/factories/classified_listing_categories.rb
rename to spec/factories/listing_categories.rb
index a1e6cbac1..99be15ca5 100644
--- a/spec/factories/classified_listing_categories.rb
+++ b/spec/factories/listing_categories.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :classified_listing_category do
+  factory :listing_category do
     name { "Education/Courses" }
     cost { [1, 5, 25].sample }
     rules  { Faker::Hipster.paragraph(sentence_count: 1) }
diff --git a/spec/factories/listings.rb b/spec/factories/listings.rb
new file mode 100644
index 000000000..8b5d0063b
--- /dev/null
+++ b/spec/factories/listings.rb
@@ -0,0 +1,16 @@
+FactoryBot.define do
+  factory :listing do
+    user
+    title { "#{Faker::Book.title} #{rand(1000)}" }
+    body_markdown { Faker::Hipster.paragraph(sentence_count: 2) }
+    published { true }
+    bumped_at { Time.current }
+
+    after(:build) do |cl|
+      if cl.listing_category.blank?
+        category = ListingCategory.first || create(:listing_category)
+        cl.listing_category = category
+      end
+    end
+  end
+end
diff --git a/spec/helpers/classified_listing_helper_spec.rb b/spec/helpers/listing_helper_spec.rb
similarity index 82%
rename from spec/helpers/classified_listing_helper_spec.rb
rename to spec/helpers/listing_helper_spec.rb
index 9a8f2263a..3758d96f9 100644
--- a/spec/helpers/classified_listing_helper_spec.rb
+++ b/spec/helpers/listing_helper_spec.rb
@@ -1,8 +1,8 @@
 require "rails_helper"
 
-RSpec.describe ClassifiedListingHelper, type: :helper do
-  let_it_be_readonly(:cat1) { create(:classified_listing_category, cost: 1) }
-  let_it_be_readonly(:cat2) { create(:classified_listing_category, :cfp, cost: 5) }
+RSpec.describe ListingHelper, type: :helper do
+  let_it_be_readonly(:cat1) { create(:listing_category, cost: 1) }
+  let_it_be_readonly(:cat2) { create(:listing_category, :cfp, cost: 5) }
 
   describe "select_options_for_categories" do
     it "returns the correct options array" do
diff --git a/spec/labor/bufferizer_spec.rb b/spec/labor/bufferizer_spec.rb
index f1b475e74..5835d6f5a 100644
--- a/spec/labor/bufferizer_spec.rb
+++ b/spec/labor/bufferizer_spec.rb
@@ -2,7 +2,7 @@ require "rails_helper"
 
 RSpec.describe Bufferizer, type: :labor do
   let(:user) { create(:user) }
-  let(:listing) { create(:classified_listing, user_id: user.id) }
+  let(:listing) { create(:listing, user_id: user.id) }
   let(:tag) { create(:tag, buffer_profile_id_code: "test") }
   let(:article) { create(:article, user_id: user.id, tags: tag.name) }
 
diff --git a/spec/labor/cache_buster_spec.rb b/spec/labor/cache_buster_spec.rb
index 4e0f42389..1d349e8af 100644
--- a/spec/labor/cache_buster_spec.rb
+++ b/spec/labor/cache_buster_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe CacheBuster, type: :labor do
   let(:article) { create(:article, user_id: user.id) }
   let(:comment) { create(:comment, user_id: user.id, commentable: article) }
   let(:organization) { create(:organization) }
-  let(:listing) { create(:classified_listing, user_id: user.id) }
+  let(:listing) { create(:listing, user_id: user.id) }
   let(:podcast) { create(:podcast) }
   let(:podcast_episode) { create(:podcast_episode, podcast_id: podcast.id) }
   let(:tag) { create(:tag) }
@@ -86,9 +86,9 @@ RSpec.describe CacheBuster, type: :labor do
     end
   end
 
-  describe "#bust_classified_listings" do
-    it "busts classified listings" do
-      expect { cache_buster.bust_classified_listings(listing) }.not_to raise_error
+  describe "#bust_listings" do
+    it "busts listings" do
+      expect { cache_buster.bust_listings(listing) }.not_to raise_error
     end
   end
 
diff --git a/spec/lib/data_update_scripts/index_classified_listings_to_elasticsearch_spec.rb b/spec/lib/data_update_scripts/index_classified_listings_to_elasticsearch_spec.rb
deleted file mode 100644
index c464cd077..000000000
--- a/spec/lib/data_update_scripts/index_classified_listings_to_elasticsearch_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require "rails_helper"
-require Rails.root.join("lib/data_update_scripts/20200217215802_index_classified_listings_to_elasticsearch.rb")
-
-describe DataUpdateScripts::IndexClassifiedListingsToElasticsearch, elasticsearch: "ClassifiedListing" do
-  it "indexes classified_listings to Elasticsearch" do
-    classified_listing = create(:classified_listing)
-    expect { classified_listing.elasticsearch_doc }.to raise_error(Search::Errors::Transport::NotFound)
-    described_class.new.run
-    expect(classified_listing.elasticsearch_doc).not_to be_nil
-  end
-end
diff --git a/spec/lib/data_update_scripts/index_listings_to_elasticsearch_spec.rb b/spec/lib/data_update_scripts/index_listings_to_elasticsearch_spec.rb
new file mode 100644
index 000000000..6c03befc9
--- /dev/null
+++ b/spec/lib/data_update_scripts/index_listings_to_elasticsearch_spec.rb
@@ -0,0 +1,11 @@
+require "rails_helper"
+require Rails.root.join("lib/data_update_scripts/20200217215802_index_listings_to_elasticsearch.rb")
+
+describe DataUpdateScripts::IndexListingsToElasticsearch, elasticsearch: "Listing" do
+  it "indexes listings to Elasticsearch" do
+    listing = create(:listing)
+    expect { listing.elasticsearch_doc }.to raise_error(Search::Errors::Transport::NotFound)
+    described_class.new.run
+    expect(listing.elasticsearch_doc).not_to be_nil
+  end
+end
diff --git a/spec/liquid_tags/classified_listing_tag_spec.rb b/spec/liquid_tags/listing_tag_spec.rb
similarity index 94%
rename from spec/liquid_tags/classified_listing_tag_spec.rb
rename to spec/liquid_tags/listing_tag_spec.rb
index 60c23b4e7..65c470503 100644
--- a/spec/liquid_tags/classified_listing_tag_spec.rb
+++ b/spec/liquid_tags/listing_tag_spec.rb
@@ -1,10 +1,10 @@
 require "rails_helper"
 
-RSpec.describe ClassifiedListingTag, type: :liquid_tag do
+RSpec.describe ListingTag, type: :liquid_tag do
   let(:user) { create(:user, username: "dariamorgendorffer", name: "Daria Morgendorffer") }
   let(:user_listing) do
     create(
-      :classified_listing,
+      :listing,
       user_id: user.id,
       title: "save me pls",
       body_markdown: "sigh sigh sigh",
@@ -16,7 +16,7 @@ RSpec.describe ClassifiedListingTag, type: :liquid_tag do
   let(:expired_listing) do
     datetime = 40.days.ago
     create(
-      :classified_listing,
+      :listing,
       user_id: user.id,
       title: "this old af",
       body_markdown: "exxpired",
@@ -36,7 +36,7 @@ RSpec.describe ClassifiedListingTag, type: :liquid_tag do
   end
   let(:org_listing) do
     create(
-      :classified_listing,
+      :listing,
       user_id: org_user.id,
       title: "this is a job posting",
       body_markdown: "wow code lots get not only money but satisfaction from work",
@@ -47,7 +47,7 @@ RSpec.describe ClassifiedListingTag, type: :liquid_tag do
   end
 
   def generate_new_liquid(slug)
-    Liquid::Template.register_tag("listing", ClassifiedListingTag)
+    Liquid::Template.register_tag("listing", ListingTag)
     Liquid::Template.parse("{% listing #{slug} %}")
   end
 
diff --git a/spec/mailers/notify_mailer_spec.rb b/spec/mailers/notify_mailer_spec.rb
index 9b613057b..6d9d88962 100644
--- a/spec/mailers/notify_mailer_spec.rb
+++ b/spec/mailers/notify_mailer_spec.rb
@@ -190,7 +190,7 @@ RSpec.describe NotifyMailer, type: :mailer do
       it "includes the listings URL" do
         expect(email.html_part.body).to include(
           CGI.escape(
-            Rails.application.routes.url_helpers.classified_listings_url,
+            Rails.application.routes.url_helpers.listings_url,
           ),
         )
       end
@@ -228,7 +228,7 @@ RSpec.describe NotifyMailer, type: :mailer do
 
       it "includes the listings URL" do
         expect(email.text_part.body).to include(
-          Rails.application.routes.url_helpers.classified_listings_url,
+          Rails.application.routes.url_helpers.listings_url,
         )
       end
 
diff --git a/spec/models/credit_spec.rb b/spec/models/credit_spec.rb
index 610b71659..a4fbb8839 100644
--- a/spec/models/credit_spec.rb
+++ b/spec/models/credit_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe Credit, type: :model do
     let_it_be(:credit) { build(:credit) }
 
     it "is valid with a purchase" do
-      credit.purchase = build(:classified_listing)
+      credit.purchase = build(:listing)
       expect(credit).to be_valid
     end
 
diff --git a/spec/models/classified_listing_category_spec.rb b/spec/models/listing_category_spec.rb
similarity index 87%
rename from spec/models/classified_listing_category_spec.rb
rename to spec/models/listing_category_spec.rb
index 4df93fa07..299a9ce52 100644
--- a/spec/models/classified_listing_category_spec.rb
+++ b/spec/models/listing_category_spec.rb
@@ -1,10 +1,10 @@
 require "rails_helper"
 
-RSpec.describe ClassifiedListingCategory, type: :model do
+RSpec.describe ListingCategory, type: :model do
   describe "validations" do
     # The uniqueness validation didn't work without this, see section "Caveat" at
     # https://www.rubydoc.info/github/thoughtbot/shoulda-matchers/Shoulda%2FMatchers%2FActiveRecord:validate_uniqueness_of
-    subject { create(:classified_listing_category) }
+    subject { create(:listing_category) }
 
     it { is_expected.to validate_presence_of(:name) }
     it { is_expected.to validate_presence_of(:cost) }
@@ -14,7 +14,7 @@ RSpec.describe ClassifiedListingCategory, type: :model do
     it { is_expected.to validate_uniqueness_of(:slug) }
 
     context "when validating social preview colors" do
-      let(:category) { build(:classified_listing_category) }
+      let(:category) { build(:listing_category) }
 
       it "rejects invalid formats" do
         category.social_preview_color = "#DEV.TO"
diff --git a/spec/models/classified_listing_spec.rb b/spec/models/listing_spec.rb
similarity index 50%
rename from spec/models/classified_listing_spec.rb
rename to spec/models/listing_spec.rb
index abdd532ed..a8ed39884 100644
--- a/spec/models/classified_listing_spec.rb
+++ b/spec/models/listing_spec.rb
@@ -1,9 +1,9 @@
 require "rails_helper"
 
-RSpec.describe ClassifiedListing, type: :model do
+RSpec.describe Listing, type: :model do
   let_it_be(:user) { create(:user) }
   let_it_be(:organization) { create(:organization) }
-  let(:classified_listing) { create(:classified_listing, user: user) }
+  let(:listing) { create(:listing, user: user) }
 
   # TODO: Remove setting of default parser from a model's callback
   # This may apply default parser on area that should not use it.
@@ -15,76 +15,76 @@ RSpec.describe ClassifiedListing, type: :model do
 
   describe "valid associations" do
     it "is not valid w/o user and org" do
-      cl = build(:classified_listing, user_id: nil, organization_id: nil)
+      cl = build(:listing, user_id: nil, organization_id: nil)
       expect(cl).not_to be_valid
       expect(cl.errors[:user_id]).to be_truthy
       expect(cl.errors[:organization_id]).to be_truthy
     end
 
     it "is valid with user_id and without organization_id" do
-      cl = build(:classified_listing, user_id: user.id, organization_id: nil)
+      cl = build(:listing, user_id: user.id, organization_id: nil)
       expect(cl).to be_valid
     end
 
     it "is valid with user_id and organization_id" do
-      cl = build(:classified_listing, user_id: user.id, organization_id: organization.id)
+      cl = build(:listing, user_id: user.id, organization_id: organization.id)
       expect(cl).to be_valid
     end
   end
 
   describe "body html" do
     it "converts markdown to html" do
-      expect(classified_listing.processed_html).to include("<p>")
+      expect(listing.processed_html).to include("<p>")
     end
 
     it "accepts 8 tags or less" do
-      classified_listing.tag_list = "a, b, c, d, e, f, g"
-      expect(classified_listing.valid?).to eq(true)
+      listing.tag_list = "a, b, c, d, e, f, g"
+      expect(listing.valid?).to eq(true)
     end
 
     it "cleans images" do
-      classified_listing.body_markdown = "hello <img src='/dssdsdsd.jpg'> hey hey hey"
-      classified_listing.save
-      expect(classified_listing.processed_html).not_to include("<img")
+      listing.body_markdown = "hello <img src='/dssdsdsd.jpg'> hey hey hey"
+      listing.save
+      expect(listing.processed_html).not_to include("<img")
     end
 
     it "doesn't accept more than 8 tags" do
-      classified_listing.tag_list = "a, b, c, d, e, f, g, h, z, t, s, p"
-      expect(classified_listing.valid?).to eq(false)
-      expect(classified_listing.errors[:tag_list]).to be_truthy
+      listing.tag_list = "a, b, c, d, e, f, g, h, z, t, s, p"
+      expect(listing.valid?).to eq(false)
+      expect(listing.errors[:tag_list]).to be_truthy
     end
 
     it "parses away tag spaces" do
-      classified_listing.tag_list = "the best, tag list"
-      classified_listing.save
-      expect(classified_listing.tag_list).to eq(%w[thebest taglist])
+      listing.tag_list = "the best, tag list"
+      listing.save
+      expect(listing.tag_list).to eq(%w[thebest taglist])
     end
   end
 
   describe "credits" do
     it "does not destroy associated credits if destroyed" do
       credit = create(:credit)
-      classified_listing.credits << credit
-      classified_listing.save!
+      listing.credits << credit
+      listing.save!
 
-      expect { classified_listing.destroy }.not_to change(Credit, :count)
+      expect { listing.destroy }.not_to change(Credit, :count)
       expect(credit.reload.purchase).to be_nil
     end
   end
 
   describe "#after_commit" do
     it "on update enqueues worker to index tag to elasticsearch" do
-      classified_listing.save
+      listing.save
 
-      sidekiq_assert_enqueued_with(job: Search::IndexWorker, args: [described_class.to_s, classified_listing.id]) do
-        classified_listing.save
+      sidekiq_assert_enqueued_with(job: Search::IndexWorker, args: [described_class.to_s, listing.id]) do
+        listing.save
       end
     end
 
-    it "on destroy enqueues job to delete classified_listing from elasticsearch" do
-      classified_listing.save
-      sidekiq_assert_enqueued_with(job: Search::RemoveFromIndexWorker, args: [described_class::SEARCH_CLASS.to_s, classified_listing.id]) do
-        classified_listing.destroy
+    it "on destroy enqueues job to delete listing from elasticsearch" do
+      listing.save
+      sidekiq_assert_enqueued_with(job: Search::RemoveFromIndexWorker, args: [described_class::SEARCH_CLASS.to_s, listing.id]) do
+        listing.destroy
       end
     end
   end
diff --git a/spec/models/organization_spec.rb b/spec/models/organization_spec.rb
index 475ef4860..84d7eb933 100644
--- a/spec/models/organization_spec.rb
+++ b/spec/models/organization_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Organization, type: :model do
 
       it { is_expected.to have_many(:api_secrets).through(:users) }
       it { is_expected.to have_many(:articles) }
-      it { is_expected.to have_many(:classified_listings) }
+      it { is_expected.to have_many(:listings) }
       it { is_expected.to have_many(:collections) }
       it { is_expected.to have_many(:credits) }
       it { is_expected.to have_many(:display_ads) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index f10f385fc..a460f325e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -28,7 +28,7 @@ RSpec.describe User, type: :model do
       it { is_expected.to have_many(:badges).through(:badge_achievements) }
       it { is_expected.to have_many(:chat_channel_memberships).dependent(:destroy) }
       it { is_expected.to have_many(:chat_channels).through(:chat_channel_memberships) }
-      it { is_expected.to have_many(:classified_listings).dependent(:destroy) }
+      it { is_expected.to have_many(:listings).dependent(:destroy) }
       it { is_expected.to have_many(:collections).dependent(:destroy) }
       it { is_expected.to have_many(:comments).dependent(:destroy) }
       it { is_expected.to have_many(:credits).dependent(:destroy) }
diff --git a/spec/requests/api/v0/classified_listings_spec.rb b/spec/requests/api/v0/listings_spec.rb
similarity index 67%
rename from spec/requests/api/v0/classified_listings_spec.rb
rename to spec/requests/api/v0/listings_spec.rb
index 3de04c749..77331a28b 100644
--- a/spec/requests/api/v0/classified_listings_spec.rb
+++ b/spec/requests/api/v0/listings_spec.rb
@@ -1,11 +1,11 @@
 require "rails_helper"
 
-RSpec.describe "Api::V0::ClassifiedListings", type: :request do
+RSpec.describe "Api::V0::Listings", type: :request do
   let_it_be_readonly(:cfp_category) do
-    create(:classified_listing_category, :cfp)
+    create(:listing_category, :cfp)
   end
   let_it_be_readonly(:edu_category) do
-    create(:classified_listing_category)
+    create(:listing_category)
   end
 
   shared_context "when user is authorized" do
@@ -19,14 +19,14 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
       {
         title: "Title",
         body_markdown: "Markdown text",
-        classified_listing_category_id: cfp_category.id
+        category: cfp_category.slug
       }
     end
     let(:draft_params) do
       {
         title: "Title draft",
         body_markdown: "Markdown draft text",
-        classified_listing_category_id: cfp_category.id,
+        category: cfp_category.slug,
         action: "draft"
       }
     end
@@ -43,8 +43,8 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
     let(:user2) { create(:user) }
 
     before do
-      create_list(:classified_listing, 3, user: user1, classified_listing_category_id: cfp_category.id)
-      create_list(:classified_listing, 4, user: user2, classified_listing_category_id: edu_category.id)
+      create_list(:listing, 3, user: user1, listing_category: cfp_category)
+      create_list(:listing, 4, user: user2, listing_category: edu_category)
     end
   end
 
@@ -58,50 +58,50 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
     include_context "with 7 listings and 2 user"
 
     it "returns json response and ok status" do
-      get api_classified_listings_path
+      get api_listings_path
       expect(response.content_type).to eq("application/json")
       expect(response).to have_http_status(:ok)
     end
 
     it "returns listings created" do
-      get api_classified_listings_path
+      get api_listings_path
       expect(response.parsed_body.size).to eq(7)
-      expect(response.parsed_body.first["type_of"]).to eq("classified_listing")
-      expect(response.parsed_body.first["slug"]).to eq(ClassifiedListing.last.slug)
+      expect(response.parsed_body.first["type_of"]).to eq("listing")
+      expect(response.parsed_body.first["slug"]).to eq(Listing.last.slug)
       expect(response.parsed_body.first["user"]).to include("username")
       expect(response.parsed_body.first["user"]["username"]).not_to be_empty
     end
 
     it "supports pagination" do
-      get api_classified_listings_path, params: { page: 2, per_page: 2 }
+      get api_listings_path, params: { page: 2, per_page: 2 }
       expect(response.parsed_body.length).to eq(2)
-      get api_classified_listings_path, params: { page: 4, per_page: 2 }
+      get api_listings_path, params: { page: 4, per_page: 2 }
       expect(response.parsed_body.length).to eq(1)
     end
 
     it "sets the correct caching headers" do
-      get api_classified_listings_path
+      get api_listings_path
 
       expect(response.headers["cache-control"]).to be_present
       expect(response.headers["surrogate-control"]).to match(/max-age/).and(match(/stale-if-error/))
     end
 
     it "sets the correct edge caching surrogate key" do
-      get api_classified_listings_path
+      get api_listings_path
 
       expected_key = (
         ["classified_listings"] +
-        user1.classified_listings.map(&:record_key) +
-        user2.classified_listings.map(&:record_key)
+        user1.listings.map(&:record_key) +
+        user2.listings.map(&:record_key)
       ).to_set
       expect(response.headers["surrogate-key"].split.to_set).to eq(expected_key)
     end
 
     it "does not return unpublished listings" do
-      listing = user1.classified_listings.last
+      listing = user1.listings.last
       listing.update(published: false)
 
-      get api_classified_listings_path
+      get api_listings_path
       expect(response.parsed_body.detect { |l| l["published"] == false }).to be_nil
     end
   end
@@ -110,30 +110,30 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
     include_context "with 7 listings and 2 user"
 
     it "displays only listings from the cfp category" do
-      get api_classified_listings_category_path("cfp")
+      get api_listings_category_path("cfp")
       expect(response).to have_http_status(:ok)
       expect(response.parsed_body.size).to eq(3)
     end
 
     it "does not return unpublished listings" do
       category = "cfp"
-      listing = user1.classified_listings.in_category(category).last
+      listing = user1.listings.in_category(category).last
       listing.update(published: false)
 
-      get api_classified_listings_category_path(category)
+      get api_listings_category_path(category)
       expect(response.parsed_body.detect { |l| l["published"] == false }).to be_nil
     end
   end
 
   describe "GET /api/listings/:id" do
     include_context "with 7 listings and 2 user"
-    let(:listing) { ClassifiedListing.in_category("cfp").last }
+    let(:listing) { Listing.in_category("cfp").last }
 
     context "when unauthenticated" do
       it "returns a published listing" do
         listing.update(published: true)
 
-        get api_classified_listing_path(listing.id)
+        get api_listing_path(listing.id)
         expect(response).to have_http_status(:ok)
       end
 
@@ -141,14 +141,14 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
         org = user_admin_organization(listing.user)
         listing.update(published: true, organization: org)
 
-        get api_classified_listing_path(listing.id)
+        get api_listing_path(listing.id)
         expect(response).to have_http_status(:ok)
       end
 
       it "does not return an unpublished listing" do
         listing.update(published: false)
 
-        get api_classified_listing_path(listing.id)
+        get api_listing_path(listing.id)
         expect(response).to have_http_status(:not_found)
       end
     end
@@ -159,14 +159,14 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
       it "returns a published listing" do
         listing.update(published: true)
 
-        get api_classified_listing_path(listing.id), headers: headers
+        get api_listing_path(listing.id), headers: headers
         expect(response).to have_http_status(:ok)
       end
 
       it "does not return an unpublished listing" do
         listing.update(published: false)
 
-        get api_classified_listing_path(listing.id), headers: headers
+        get api_listing_path(listing.id), headers: headers
         expect(response).to have_http_status(:not_found)
       end
     end
@@ -179,45 +179,45 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
       it "returns a published listing" do
         listing.update(published: true)
 
-        get api_classified_listing_path(listing.id), headers: headers
+        get api_listing_path(listing.id), headers: headers
         expect(response).to have_http_status(:ok)
       end
 
       it "does not return an unpublished listing belonging to another user" do
         listing.update(published: false, user: user1)
 
-        get api_classified_listing_path(listing.id), headers: headers
+        get api_listing_path(listing.id), headers: headers
         expect(response).to have_http_status(:not_found)
       end
 
       it "returns an unpublished listing belonging to the authenticated user" do
         listing.update(published: false, user: api_secret.user)
 
-        get api_classified_listing_path(listing.id), headers: headers
+        get api_listing_path(listing.id), headers: headers
         expect(response).to have_http_status(:ok)
       end
     end
 
     it "returns the correct listing format" do
-      get api_classified_listing_path(listing.id)
+      get api_listing_path(listing.id)
 
       expect(response).to have_http_status(:ok)
 
-      expect(response.parsed_body["type_of"]).to eq("classified_listing")
+      expect(response.parsed_body["type_of"]).to eq("listing")
       expect(response.parsed_body["slug"]).to eq(listing.slug)
       expect(response.parsed_body["user"]).to include("username")
       expect(response.parsed_body["user"]["username"]).not_to be_empty
     end
 
     it "sets the correct caching headers" do
-      get api_classified_listing_path(listing.id)
+      get api_listing_path(listing.id)
 
       expect(response.headers["cache-control"]).to be_present
       expect(response.headers["surrogate-control"]).to match(/max-age/).and(match(/stale-if-error/))
     end
 
     it "sets the correct edge caching surrogate key" do
-      get api_classified_listing_path(listing.id)
+      get api_listing_path(listing.id)
 
       expected_key = [listing.record_key].to_set
       expect(response.headers["surrogate-key"].split.to_set).to eq(expected_key)
@@ -225,37 +225,37 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
   end
 
   describe "POST /api/listings" do
-    def post_classified_listing(key: api_secret.secret, **params)
+    def post_listing(key: api_secret.secret, **params)
       headers = { "api-key" => key, "content-type" => "application/json" }
-      post api_classified_listings_path, params: { classified_listing: params }.to_json, headers: headers
+      post api_listings_path, params: { classified_listing: params }.to_json, headers: headers
     end
 
     describe "user cannot proceed if not properly unauthorized" do
       let(:api_secret) { create(:api_secret) }
 
       it "fails with no api key" do
-        post api_classified_listings_path, headers: { "content-type" => "application/json" }
+        post api_listings_path, headers: { "content-type" => "application/json" }
         expect(response).to have_http_status(:unauthorized)
       end
 
       it "fails with the wrong api key" do
-        post api_classified_listings_path, headers: { "api-key" => "foobar", "content-type" => "application/json" }
+        post api_listings_path, headers: { "api-key" => "foobar", "content-type" => "application/json" }
         expect(response).to have_http_status(:unauthorized)
       end
     end
 
-    describe "user must have enough credit to create a classified listing" do
+    describe "user must have enough credit to create a listing" do
       include_context "when user is authorized"
       include_context "when param list is valid"
 
-      it "fails to create a classified listing if user does not have enough credit" do
-        post_classified_listing(listing_params)
+      it "fails to create a listing if user does not have enough credit" do
+        post_listing(listing_params)
         expect(response).to have_http_status(:payment_required)
       end
 
-      it "fails to create a classifiedlisting if the org does not have enough credit" do
+      it "fails to create a listing if the org does not have enough credit" do
         org = user_admin_organization(user)
-        post_classified_listing(
+        post_listing(
           **listing_params,
           organization_id: org.id,
         )
@@ -263,12 +263,12 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
       end
     end
 
-    describe "user cannot create a classified with a request lacking mandatory parameters" do
+    describe "user cannot create a with a request lacking mandatory parameters" do
       let(:invalid_params) do
         {
           title: "Title",
           category: "cfp",
-          classified_listing_category_id: cfp_category.id
+          listing_category: cfp_category
         }
       end
 
@@ -276,41 +276,41 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
       include_context "when user has enough credit"
 
       it "fails if no params are given" do
-        post_classified_listing
+        post_listing
         expect(response).to have_http_status(:unprocessable_entity)
       end
 
       it "fails if body_markdown is missing" do
-        post_classified_listing(invalid_params)
+        post_listing(invalid_params)
         expect(response).to have_http_status(:unprocessable_entity)
       end
 
       it "fails if category is missing" do
-        post_classified_listing(title: "Title", body_markdown: "body")
+        post_listing(title: "Title", body_markdown: "body")
         expect(response).to have_http_status(:unprocessable_entity)
       end
 
       it "fails if category is invalid" do
-        post_classified_listing(title: "Title", body_markdown: "body", category: "unknown")
+        post_listing(title: "Title", body_markdown: "body", category: "unknown")
         expect(response).to have_http_status(:unprocessable_entity)
-        expect(response.parsed_body.dig("errors", "classified_listing_category").first).
+        expect(response.parsed_body.dig("errors", "listing_category").first).
           to match(/must exist/)
       end
 
       it "does not subtract credits or create a listing if the listing is not valid" do
         expect do
-          post_classified_listing(invalid_params)
-        end.to change(ClassifiedListing, :count).by(0).and change(user.credits.spent, :size).by(0)
+          post_listing(invalid_params)
+        end.to change(Listing, :count).by(0).and change(user.credits.spent, :size).by(0)
       end
     end
 
-    describe "user creates classified listings" do
+    describe "user creates listings" do
       include_context "when user is authorized"
       include_context "when param list is valid"
       include_context "when user has enough credit"
 
       it "properly deducts the amount of credits" do
-        post_classified_listing(listing_params)
+        post_listing(listing_params)
         expect(response).to have_http_status(:created)
 
         expect(user.credits.spent.size).to eq(cfp_category.cost)
@@ -320,44 +320,44 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
         org_admin = api_secret_org.user
         org_id = org_admin.organizations.first.id
         Credit.create(organization_id: org_id)
-        post_classified_listing(key: api_secret_org.secret, **draft_params.merge(organization_id: org_id))
-        expect(ClassifiedListing.first.organization_id).to eq org_id
+        post_listing(key: api_secret_org.secret, **draft_params.merge(organization_id: org_id))
+        expect(Listing.first.organization_id).to eq org_id
       end
 
       it "creates a listing under the org" do
         org = user_admin_organization(user)
         Credit.create(organization_id: org.id)
-        post_classified_listing(listing_params.merge(organization_id: org.id))
-        expect(ClassifiedListing.first.organization_id).to eq org.id
+        post_listing(listing_params.merge(organization_id: org.id))
+        expect(Listing.first.organization_id).to eq org.id
       end
 
       it "does not create a listing draft for an org not belonging to the user" do
         org = create(:organization)
         expect do
-          post_classified_listing(draft_params.merge(organization_id: org.id))
+          post_listing(draft_params.merge(organization_id: org.id))
           expect(response).to have_http_status(:unauthorized)
-        end.to change(ClassifiedListing, :count).by(0)
+        end.to change(Listing, :count).by(0)
       end
 
       it "does not create a listing for an org not belonging to the user" do
         org = create(:organization)
         expect do
-          post_classified_listing(listing_params.merge(organization_id: org.id))
+          post_listing(listing_params.merge(organization_id: org.id))
           expect(response).to have_http_status(:unauthorized)
-        end.to change(ClassifiedListing, :count).by(0)
+        end.to change(Listing, :count).by(0)
       end
 
       it "assigns the spent credits to the listing" do
-        post_classified_listing(listing_params)
+        post_listing(listing_params)
         spent_credit = user.credits.spent.last
-        expect(spent_credit.purchase_type).to eq("ClassifiedListing")
+        expect(spent_credit.purchase_type).to eq("Listing")
         expect(spent_credit.spent_at).not_to be_nil
       end
 
       it "cannot create a draft due to internal error" do
         allow(Organization).to receive(:find_by)
-        post_classified_listing(draft_params.except(:classified_listing_category_id))
-        expect(response.parsed_body.dig("errors", "classified_listing_category").first).
+        post_listing(draft_params.except(:category))
+        expect(response.parsed_body.dig("errors", "listing_category").first).
           to match(/must exist/)
         expect(response).to have_http_status(:unprocessable_entity)
       end
@@ -365,57 +365,57 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
       it "creates listing draft and does not subtract credits" do
         allow(Credits::Buyer).to receive(:call).and_raise(ActiveRecord::Rollback)
         expect do
-          post_classified_listing(draft_params)
-        end.to change(ClassifiedListing, :count).by(1).
+          post_listing(draft_params)
+        end.to change(Listing, :count).by(1).
           and change(user.credits.spent, :size).by(0)
       end
 
       it "does not create a listing or subtract credits if the purchase does not go through" do
         allow(Credits::Buyer).to receive(:call).and_raise(ActiveRecord::Rollback)
         expect do
-          post_classified_listing(listing_params)
-        end.to change(ClassifiedListing, :count).by(0).
+          post_listing(listing_params)
+        end.to change(Listing, :count).by(0).
           and change(user.credits.spent, :size).by(0)
       end
 
-      it "creates a classified listing belonging to the user" do
+      it "creates a listing belonging to the user" do
         expect do
-          post_classified_listing(listing_params)
+          post_listing(listing_params)
           expect(response).to have_http_status(:created)
-        end.to change(ClassifiedListing, :count).by(1)
-        expect(ClassifiedListing.find(response.parsed_body["id"]).user).to eq(user)
+        end.to change(Listing, :count).by(1)
+        expect(Listing.find(response.parsed_body["id"]).user).to eq(user)
       end
 
-      it "creates a classified listing with a title, a body markdown, a category" do
+      it "creates a listing with a title, a body markdown, a category" do
         expect do
-          post_classified_listing(listing_params)
+          post_listing(listing_params)
           expect(response).to have_http_status(:created)
-        end.to change(ClassifiedListing, :count).by(1)
+        end.to change(Listing, :count).by(1)
 
-        listing = ClassifiedListing.find(response.parsed_body["id"])
+        listing = Listing.find(response.parsed_body["id"])
 
         expect(listing.title).to eq(listing_params[:title])
         expect(listing.body_markdown).to eq(listing_params[:body_markdown])
         expect(listing.category).to eq(cfp_category.slug)
       end
 
-      it "creates a classified listing with a location" do
+      it "creates a listing with a location" do
         params = listing_params.merge(location: "Frejus")
         expect do
-          post_classified_listing(params)
+          post_listing(params)
           expect(response).to have_http_status(:created)
-        end.to change(ClassifiedListing, :count).by(1)
-        expect(ClassifiedListing.find(response.parsed_body["id"]).location).to eq("Frejus")
+        end.to change(Listing, :count).by(1)
+        expect(Listing.find(response.parsed_body["id"]).location).to eq("Frejus")
       end
 
-      it "creates a classified listing with a list of tags and a contact" do
+      it "creates a listing with a list of tags and a contact" do
         params = listing_params.merge(tags: %w[discuss javascript], contact_via_connect: true)
         expect do
-          post_classified_listing(params)
+          post_listing(params)
           expect(response).to have_http_status(:created)
-        end.to change(ClassifiedListing, :count).by(1)
+        end.to change(Listing, :count).by(1)
 
-        listing = ClassifiedListing.find(response.parsed_body["id"])
+        listing = Listing.find(response.parsed_body["id"])
 
         expect(listing.cached_tag_list).to eq("discuss, javascript")
         expect(listing.contact_via_connect).to be(true)
@@ -430,26 +430,26 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
         access_token = create(:doorkeeper_access_token, resource_owner_id: user.id)
         headers = { "authorization" => "Bearer #{access_token.token}", "content-type" => "application/json" }
 
-        post api_classified_listings_path, params: { classified_listing: listing_params }.to_json, headers: headers
+        post api_listings_path, params: { listing: listing_params }.to_json, headers: headers
         expect(response).to have_http_status(:unauthorized)
       end
     end
   end
 
   describe "PUT /api/listings/:id" do
-    def put_classified_listing(id, **params)
+    def put_listing(id, **params)
       headers = { "api-key" => api_secret.secret, "content-type" => "application/json" }
-      put api_classified_listing_path(id), params: { classified_listing: params }.to_json, headers: headers
+      put api_listing_path(id), params: { classified_listing: params }.to_json, headers: headers
     end
 
     let(:user) { create(:user) }
     let(:another_user) { create(:user) }
-    let!(:listing) { create(:classified_listing, user: user) }
-    let(:another_user_listing) { create(:classified_listing, user_id: another_user.id) }
-    let(:listing_draft) { create(:classified_listing, user: user) }
+    let!(:listing) { create(:listing, user: user) }
+    let(:another_user_listing) { create(:listing, user_id: another_user.id) }
+    let(:listing_draft) { create(:listing, user: user) }
     let(:organization) { create(:organization) }
-    let(:org_listing) { create(:classified_listing, user: user, organization: organization) }
-    let(:org_listing_draft) { create(:classified_listing, user: user, organization: organization) }
+    let(:org_listing) { create(:listing, user: user, organization: organization) }
+    let(:org_listing_draft) { create(:listing, user: user, organization: organization) }
 
     before do
       listing_draft.update_columns(bumped_at: nil, published: false)
@@ -460,12 +460,12 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
       let(:api_secret) { create(:api_secret) }
 
       it "fails with no api key" do
-        put api_classified_listing_path(listing.id), headers: { "content-type" => "application/json" }
+        put api_listing_path(listing.id), headers: { "content-type" => "application/json" }
         expect(response).to have_http_status(:unauthorized)
       end
 
       it "fails with the wrong api key" do
-        put api_classified_listing_path(listing.id), headers: { "api-key" => "foobar", "content-type" => "application/json" }
+        put api_listing_path(listing.id), headers: { "api-key" => "foobar", "content-type" => "application/json" }
         expect(response).to have_http_status(:unauthorized)
       end
     end
@@ -473,16 +473,16 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
     context "when authorized user has no credit" do
       include_context "when user is authorized"
 
-      it "fails to bump a classified listing" do
+      it "fails to bump a listing" do
         previous_bumped_at = listing.bumped_at
-        put_classified_listing(listing.id, action: "bump")
+        put_listing(listing.id, action: "bump")
         expect(response).to have_http_status(:payment_required)
         expect(listing.reload.bumped_at.to_i).to eq(previous_bumped_at.to_i)
       end
 
       it "does not subtract spent credits if the user has not enough credits" do
         expect do
-          put_classified_listing(listing.id, action: "bump")
+          put_listing(listing.id, action: "bump")
         end.to change(user.credits.spent, :size).by(0)
       end
     end
@@ -491,13 +491,13 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
       include_context "when user is authorized"
       include_context "when user has enough credit"
 
-      let(:params) { { classified_listing: { action: "bump" } } }
+      let(:params) { { listing: { action: "bump" } } }
 
       it "does not bump the listing or subtract credits if the purchase does not go through" do
         previous_bumped_at = listing.bumped_at
         allow(Credits::Buyer).to receive(:call).and_raise(ActiveRecord::Rollback)
         expect do
-          put_classified_listing(listing.id, action: "bump")
+          put_listing(listing.id, action: "bump")
         end.to change(user.credits.spent, :size).by(0)
         expect(listing.reload.bumped_at.to_i).to eq(previous_bumped_at.to_i)
       end
@@ -507,7 +507,7 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
         create_list(:credit, cost, user: user)
         previous_bumped_at = listing.bumped_at
         expect do
-          put_classified_listing(listing.id, action: "bump")
+          put_listing(listing.id, action: "bump")
         end.to change(user.credits.spent, :size).by(cost)
         expect(listing.reload.bumped_at >= previous_bumped_at).to eq(true)
       end
@@ -518,7 +518,7 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
         create_list(:credit, cost, user: user)
         previous_bumped_at = org_listing.bumped_at
         expect do
-          put_classified_listing(org_listing.id, action: "bump")
+          put_listing(org_listing.id, action: "bump")
         end.to change(organization.credits.spent, :size).by(cost)
         expect(org_listing.reload.bumped_at >= previous_bumped_at).to eq(true)
       end
@@ -528,7 +528,7 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
         create_list(:credit, cost, user: user)
         previous_bumped_at = org_listing.bumped_at
         expect do
-          put_classified_listing(org_listing.id, action: "bump")
+          put_listing(org_listing.id, action: "bump")
         end.to change(user.credits.spent, :size).by(cost)
         expect(org_listing.reload.bumped_at >= previous_bumped_at).to eq(true)
       end
@@ -541,14 +541,14 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
         cost = listing_draft.cost
         create_list(:credit, cost, user: user)
         expect do
-          put_classified_listing(listing_draft.id, action: "publish")
+          put_listing(listing_draft.id, action: "publish")
         end.to change(user.credits.spent, :size).by(cost)
       end
 
       it "publishes a draft and ensures published column is true" do
         cost = listing_draft.cost
         create_list(:credit, cost, user: user)
-        put_classified_listing(listing_draft.id, action: "publish")
+        put_listing(listing_draft.id, action: "publish")
         expect(listing_draft.reload.published).to eq(true)
       end
 
@@ -556,27 +556,27 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
         cost = org_listing_draft.cost
         create_list(:credit, cost, organization: organization)
         expect do
-          put_classified_listing(org_listing_draft.id, action: "publish")
+          put_listing(org_listing_draft.id, action: "publish")
         end.to change(organization.credits.spent, :size).by(cost)
       end
 
       it "publishes an org draft and ensures published column is true" do
         cost = org_listing_draft.cost
         create_list(:credit, cost, organization: organization)
-        put_classified_listing(org_listing_draft.id, action: "publish")
+        put_listing(org_listing_draft.id, action: "publish")
         expect(org_listing_draft.reload.published).to eq(true)
       end
 
       it "publishes a draft that was charged and is within 30 days of bump doesn't charge credits" do
         listing.update_column(:published, false)
         expect do
-          put_classified_listing(listing.id, action: "publish")
+          put_listing(listing.id, action: "publish")
         end.to change(user.credits.spent, :size).by(0)
       end
 
       it "publishes a draft that was charged and is within 30 days of bump and successfully sets published as true" do
         listing.update_column(:published, false)
-        put_classified_listing(listing.id, action: "publish")
+        put_listing(listing.id, action: "publish")
         expect(listing.reload.published).to eq(true)
       end
     end
@@ -586,12 +586,12 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
 
       it "fails to publish draft and doesn't charge credits" do
         expect do
-          put_classified_listing(listing_draft.id, action: "publish")
+          put_listing(listing_draft.id, action: "publish")
         end.to change(user.credits.spent, :size).by(0)
       end
 
       it "fails to publish draft and published remains false" do
-        put_classified_listing(listing_draft.id, action: "publish")
+        put_listing(listing_draft.id, action: "publish")
         expect(listing_draft.reload.published).to eq(false)
       end
     end
@@ -601,40 +601,40 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
       include_context "when user has enough credit"
 
       it "fails if no params have been given" do
-        put_classified_listing(listing.id)
+        put_listing(listing.id)
         expect(response).to have_http_status(:unprocessable_entity)
       end
 
       it "fails if category is invalid" do
-        max_id = ClassifiedListingCategory.maximum(:id)
-        put_classified_listing(listing.id, title: "New title", classified_listing_category_id: max_id + 1)
+        max_id = ListingCategory.maximum(:id)
+        put_listing(listing.id, title: "New title", listing_category_id: max_id + 1)
         expect(response).to have_http_status(:unprocessable_entity)
-        expect(response.parsed_body.dig("errors", "classified_listing_category").first).
+        expect(response.parsed_body.dig("errors", "listing_category").first).
           to match(/must exist/)
       end
 
       it "updates the title of his listing" do
-        put_classified_listing(listing.id, title: "This is a new title")
+        put_listing(listing.id, title: "This is a new title")
         expect(response).to have_http_status(:ok)
         expect(listing.reload.title).to eq "This is a new title"
       end
 
       it "updates the tags" do
-        put_classified_listing(listing.id, tags: %w[golang api])
+        put_listing(listing.id, tags: %w[golang api])
         expect(response).to have_http_status(:ok)
         expect(listing.reload.cached_tag_list).to eq "golang, api"
       end
 
       it "unpublishes the listing" do
         expect do
-          put_classified_listing(listing.id, action: "unpublish")
+          put_listing(listing.id, action: "unpublish")
           listing.reload
         end.to change(listing, :published).from(true).to(false)
         expect(response).to have_http_status(:ok)
       end
 
       it "cannot update another user listing" do
-        put_classified_listing(another_user_listing.id, title: "Test for a new title")
+        put_listing(another_user_listing.id, title: "Test for a new title")
         expect(response).to have_http_status(:unauthorized)
       end
 
@@ -643,7 +643,7 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
 
         new_title = Faker::Book.title
 
-        put_classified_listing(listing.id, title: new_title)
+        put_listing(listing.id, title: new_title)
         expect(listing.reload.title).to eq(new_title)
       end
 
@@ -652,7 +652,7 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
 
         new_title = Faker::Book.title
 
-        put_classified_listing(listing.id, title: new_title)
+        put_listing(listing.id, title: new_title)
         expect(listing.reload.title).to eq(listing.title)
       end
 
@@ -662,7 +662,7 @@ RSpec.describe "Api::V0::ClassifiedListings", type: :request do
         old_title = listing.title
         new_title = Faker::Book.title
 
-        put_classified_listing(listing.id, title: new_title)
+        put_listing(listing.id, title: new_title)
         expect(listing.reload.title).to eq(old_title)
       end
     end
diff --git a/spec/requests/classified_listings_spec.rb b/spec/requests/classified_listings_spec.rb
deleted file mode 100644
index aa381c991..000000000
--- a/spec/requests/classified_listings_spec.rb
+++ /dev/null
@@ -1,519 +0,0 @@
-require "rails_helper"
-
-RSpec.describe "ClassifiedListings", type: :request do
-  let_it_be_readonly(:edu_category) do
-    create(:classified_listing_category, cost: 1)
-  end
-  let(:user) { create(:user) }
-  let(:listing_params) do
-    {
-      classified_listing: {
-        title: "something",
-        body_markdown: "something else",
-        classified_listing_category_id: edu_category.id,
-        tag_list: "",
-        contact_via_connect: true
-      }
-    }
-  end
-  let(:draft_params) do
-    {
-      classified_listing: {
-        title: "this a draft",
-        body_markdown: "something draft",
-        classified_listing_category_id: edu_category.id,
-        tag_list: "",
-        contact_via_connect: true,
-        action: "draft"
-      }
-    }
-  end
-
-  describe "GET /listings" do
-    let(:listing) { create(:classified_listing, user: user) }
-    let(:expired_listing) { create(:classified_listing, user: user) }
-
-    before do
-      sign_in user
-      create_list(:credit, 25, user: user)
-    end
-
-    it "returns text/html and has status 200" do
-      get "/listings"
-      expect(response.content_type).to eq("text/html")
-      expect(response).to have_http_status(:ok)
-    end
-
-    context "when the user has no params" do
-      it "shows all active listings" do
-        get "/listings"
-        expect(response.body).to include("classifieds-container")
-      end
-    end
-
-    context "when the user has category and slug params for active listing" do
-      it "shows that direct listing" do
-        get "/listings", params: { category: listing.category, slug: listing.slug }
-        expect(response.body).to include(CGI.escapeHTML(listing.title))
-      end
-    end
-
-    context "when the user has category and slug params for expired listing" do
-      it "shows only active listings from that category" do
-        expired_listing.published = false
-        expired_listing.save
-        get "/listings", params: { category: expired_listing.category, slug: expired_listing.slug }
-        expect(response.body).not_to include(CGI.escapeHTML(expired_listing.title))
-      end
-    end
-
-    context "when view is moderate" do
-      it "redirects to internal/listings/:id/edit" do
-        get "/listings", params: { view: "moderate", slug: listing.slug }
-        expect(response.redirect_url).to include("/internal/listings/#{listing.id}/edit")
-      end
-
-      it "without a slug raises an ActiveRecord::RecordNotFound error" do
-        expect do
-          get "/listings", params: { view: "moderate" }
-        end.to raise_error(ActiveRecord::RecordNotFound)
-      end
-    end
-  end
-
-  describe "GET /listings/new" do
-    before { sign_in user }
-
-    it "shows the option to create draft" do
-      get "/listings/new"
-      expect(response.body).to include "You will not be charged credits to save a draft."
-    end
-
-    context "when the user has no credits" do
-      it "shows the proper messages" do
-        get "/listings/new"
-        expect(response.body).to include "Listings Require Credits"
-        expect(response.body).to include "You need at least one credit to create a listing."
-      end
-    end
-
-    context "when the user has credits" do
-      it "shows the number of credits" do
-        random_number = rand(2..100)
-        create_list(:credit, random_number, user: user)
-        get "/listings/new"
-        expect(response.body).to include "You have #{random_number} credits available"
-      end
-    end
-
-    context "when the user has no credits and belongs to an organization" do
-      let(:organization) { create(:organization) }
-
-      before { create(:organization_membership, user_id: user.id, organization_id: organization.id) }
-
-      it "shows the proper message when both user and org have no credits" do
-        get "/listings/new"
-        expect(response.body).to include "Listings Require Credits"
-      end
-
-      it "shows the number of credits of the user if the user has credits but the org has no credits" do
-        random_number = rand(2..100)
-        create_list(:credit, random_number, user: user)
-        get "/listings/new"
-        expect(response.body).to include "You have #{random_number} credits available"
-      end
-
-      it "shows the number of credits of the organization if the org has credits" do
-        random_number = rand(2..100)
-        create_list(:credit, random_number, organization: organization)
-        get "/listings/new"
-        expect(response.body).to include "has <span id=\"org-credits-number\">#{random_number}</span> credits"
-      end
-
-      it "shows the number of credits of both the user and the organization if they both have credits" do
-        random_number = rand(2..100)
-        create_list(:credit, random_number, organization: organization)
-        create_list(:credit, random_number, user: user)
-        get "/listings/new"
-        expect(response.body).to include "has <span id=\"org-credits-number\">#{random_number}</span> credits"
-        expect(response.body).to include "You have #{random_number} credits available"
-      end
-    end
-  end
-
-  describe "POST /listings" do
-    before do
-      sign_in user
-      create_list(:credit, 25, user: user)
-    end
-
-    let_it_be_readonly(:cfp_category) { create(:classified_listing_category, :cfp) }
-
-    context "when the listing is invalid" do
-      let(:invalid_params) do
-        {
-          classified_listing: {
-            title: "nothing",
-            body_markdown: "",
-            classified_listing_category_id: cfp_category.id,
-            tag_list: ""
-          }
-        }
-      end
-
-      it "renders errors with the listing" do
-        post "/listings", params: invalid_params
-        expect(response.body).to include("prohibited this listing from being saved")
-      end
-
-      it "does not subtract credits or create a listing if the listing is not valid" do
-        expect do
-          post "/listings", params: invalid_params
-        end.to change(ClassifiedListing, :count).by(0).
-          and change(user.credits.spent, :size).by(0)
-      end
-    end
-
-    context "when the listing is valid" do
-      it "redirects if the user does not have enough credits" do
-        Credit.delete_all
-        post "/listings", params: listing_params
-        expect(response.body).to redirect_to("/credits")
-      end
-
-      it "redirects if the org does not have enough credits" do
-        org_admin = create(:user, :org_admin)
-        listing_params[:classified_listing][:post_as_organization] = "1"
-        sign_in org_admin
-        post "/listings", params: listing_params
-        expect(response.body).to redirect_to("/credits")
-      end
-
-      it "redirects to /listings/dashboard for listing draft" do
-        post "/listings", params: draft_params
-        expect(response).to redirect_to "/listings/dashboard"
-      end
-
-      it "redirects to /listings" do
-        post "/listings", params: listing_params
-        expect(response).to redirect_to "/listings"
-      end
-
-      it "properly deducts the amount of credits" do
-        expect do
-          post "/listings", params: listing_params
-        end.to change { user.credits.spent.size }.by(edu_category.cost)
-      end
-
-      it "creates a listing draft under the org" do
-        org_admin = create(:user, :org_admin)
-        org_id = org_admin.organizations.first.id
-        Credit.create(organization_id: org_id)
-        draft_params[:classified_listing][:organization_id] = org_id
-        sign_in org_admin
-        post "/listings", params: draft_params
-        expect(ClassifiedListing.first.organization_id).to eq org_id
-      end
-
-      it "creates a listing under the org" do
-        org_admin = create(:user, :org_admin)
-        org_id = org_admin.organizations.first.id
-        Credit.create(organization_id: org_id)
-        listing_params[:classified_listing][:organization_id] = org_id
-        sign_in org_admin
-        post "/listings", params: listing_params
-        expect(ClassifiedListing.first.organization_id).to eq org_id
-      end
-
-      it "does not create a listing draft for an org not belonging to the user" do
-        org = create(:organization)
-        draft_params[:classified_listing][:organization_id] = org.id
-        expect { post "/listings", params: draft_params }.to raise_error(Pundit::NotAuthorizedError)
-      end
-
-      it "does not create a listing for an org not belonging to the user" do
-        org = create(:organization)
-        listing_params[:classified_listing][:organization_id] = org.id
-        expect { post "/listings", params: listing_params }.to raise_error(Pundit::NotAuthorizedError)
-      end
-
-      it "assigns the spent credits to the listing" do
-        post "/listings", params: listing_params
-        spent_credit = user.credits.spent.last
-        expect(spent_credit.purchase_type).to eq("ClassifiedListing")
-        expect(spent_credit.spent_at).not_to be_nil
-      end
-
-      it "creates listing draft and does not subtract credits" do
-        allow(Credits::Buyer).to receive(:call).and_raise(ActiveRecord::Rollback)
-        expect do
-          post "/listings", params: draft_params
-        end.to change(ClassifiedListing, :count).by(1).
-          and change(user.credits.spent, :size).by(0)
-      end
-
-      it "does not create a listing or subtract credits if the purchase does not go through" do
-        allow(Credits::Buyer).to receive(:call).and_raise(ActiveRecord::Rollback)
-        expect do
-          post "/listings", params: listing_params
-        end.to change(ClassifiedListing, :count).by(0).
-          and change(user.credits.spent, :size).by(0)
-      end
-    end
-
-    context "when user is banned" do
-      it "raises error" do
-        user.add_role(:banned)
-        expect do
-          post "/listings", params: listing_params
-        end.to raise_error("SUSPENDED")
-      end
-    end
-  end
-
-  describe "PUT /listings/:id" do
-    let(:listing) { create(:classified_listing, user: user) }
-    let(:listing_draft) { create(:classified_listing, user: user) }
-    let(:organization) { create(:organization) }
-    let(:org_listing) { create(:classified_listing, user: user, organization: organization) }
-    let(:org_listing_draft) { create(:classified_listing, user: user, organization: organization) }
-
-    before do
-      sign_in user
-      listing_draft.update_columns(bumped_at: nil, published: false)
-      org_listing_draft.update_columns(bumped_at: nil, published: false)
-    end
-
-    context "when the bump action is called" do
-      let(:params) { { classified_listing: { action: "bump" } } }
-
-      it "does not bump the user listing and redirects to credits if the user has not enough credits" do
-        previous_bumped_at = listing.bumped_at
-        put "/listings/#{listing.id}", params: params
-        expect(listing.reload.bumped_at.to_i).to eq(previous_bumped_at.to_i)
-        expect(response.body).to redirect_to("/credits")
-      end
-
-      it "does not subtract spent credits if the user has not enough credits" do
-        expect do
-          put "/listings/#{listing.id}", params: params
-        end.to change(user.credits.spent, :size).by(0)
-      end
-
-      it "does not bump the listing or subtract credits if the purchase does not go through" do
-        previous_bumped_at = listing.bumped_at
-        allow(Credits::Buyer).to receive(:call).and_raise(ActiveRecord::Rollback)
-        expect do
-          put "/listings/#{listing.id}", params: params
-        end.to change(user.credits.spent, :size).by(0)
-        expect(listing.reload.bumped_at.to_i).to eq(previous_bumped_at.to_i)
-      end
-
-      it "bumps the listing and subtract credits" do
-        cost = listing.cost
-        create_list(:credit, cost, user: user)
-        previous_bumped_at = listing.bumped_at
-        expect do
-          put "/listings/#{listing.id}", params: params
-        end.to change(user.credits.spent, :size).by(cost)
-        expect(listing.reload.bumped_at >= previous_bumped_at).to eq(true)
-      end
-
-      it "bumps the org listing using org credits before user credits" do
-        cost = org_listing.cost
-        create_list(:credit, cost, organization: organization)
-        create_list(:credit, cost, user: user)
-        previous_bumped_at = org_listing.bumped_at
-        expect do
-          put "/listings/#{org_listing.id}", params: params
-        end.to change(organization.credits.spent, :size).by(cost)
-        expect(org_listing.reload.bumped_at >= previous_bumped_at).to eq(true)
-      end
-
-      it "bumps the org listing using user credits if org credits insufficient and user credits are" do
-        cost = org_listing.cost
-        create_list(:credit, cost, user: user)
-        previous_bumped_at = org_listing.bumped_at
-        expect do
-          put "/listings/#{org_listing.id}", params: params
-        end.to change(user.credits.spent, :size).by(cost)
-        expect(org_listing.reload.bumped_at >= previous_bumped_at).to eq(true)
-      end
-    end
-
-    context "when the publish action is called" do
-      let(:params) { { classified_listing: { action: "publish" } } }
-
-      it "publishes a draft and charges user credits if first publish" do
-        cost = listing_draft.cost
-        create_list(:credit, cost, user: user)
-        expect do
-          put "/listings/#{listing_draft.id}", params: params
-        end.to change(user.credits.spent, :size).by(cost)
-      end
-
-      it "publishes a draft and ensures published column is true" do
-        cost = listing_draft.cost
-        create_list(:credit, cost, user: user)
-        put "/listings/#{listing_draft.id}", params: params
-        expect(listing_draft.reload.published).to eq(true)
-      end
-
-      it "publishes an org draft and charges org credits if first publish" do
-        cost = org_listing_draft.cost
-        create_list(:credit, cost, organization: organization)
-        expect do
-          put "/listings/#{org_listing_draft.id}", params: params
-        end.to change(organization.credits.spent, :size).by(cost)
-      end
-
-      it "publishes an org draft and ensures published column is true" do
-        cost = org_listing_draft.cost
-        create_list(:credit, cost, organization: organization)
-        put "/listings/#{org_listing_draft.id}", params: params
-        expect(org_listing_draft.reload.published).to eq(true)
-      end
-
-      it "publishes a draft that was charged and is within 30 days of bump doesn't charge credits" do
-        listing.update_column(:published, false)
-        expect do
-          put "/listings/#{listing.id}", params: params
-        end.to change(user.credits.spent, :size).by(0)
-      end
-
-      it "publishes a draft that was charged and is within 30 days of bump and successfully sets published as true" do
-        listing.update_column(:published, false)
-        put "/listings/#{listing.id}", params: params
-        expect(listing.reload.published).to eq(true)
-      end
-
-      it "fails to publish draft and doesn't charge credits" do
-        expect do
-          put "/listings/#{listing_draft.id}", params: params
-        end.to change(user.credits.spent, :size).by(0)
-      end
-
-      it "fails to publish draft and published remains false" do
-        put "/listings/#{listing_draft.id}", params: params
-        expect(listing_draft.reload.published).to eq(false)
-      end
-    end
-
-    context "when the unpublish action is called" do
-      let(:params) { { classified_listing: { action: "unpublish" } } }
-
-      it "unpublishes a published listing" do
-        put "/listings/#{listing.id}", params: params
-        expect(listing.reload.published).to eq(false)
-      end
-    end
-
-    context "when an update is attempted" do
-      it "does not update with an empty body markdown" do
-        put "/listings/#{listing.id}", params: { classified_listing: { body_markdown: "" } }
-        expect(response.body).to include(CGI.escapeHTML("can't be blank"))
-        expect(listing.reload.body_markdown).not_to be_empty
-      end
-    end
-  end
-
-  describe "DEL /listings/:id" do
-    let!(:listing) { create(:classified_listing, user: user) }
-    let!(:listing_draft) { create(:classified_listing, user: user, bumped_at: nil, published: false) }
-    let(:organization) { create(:organization) }
-    let!(:org_listing) { create(:classified_listing, user: user, organization: organization) }
-    let!(:org_listing_draft) do
-      create(:classified_listing, user: user, organization: organization, bumped_at: nil, published: false)
-    end
-
-    before do
-      sign_in user
-    end
-
-    context "when deleting draft" do
-      it "redirect to dashboard" do
-        delete "/listings/#{listing_draft.id}"
-        expect(response).to redirect_to("/listings/dashboard")
-      end
-
-      it "have status 302 found" do
-        delete "/listings/#{listing_draft.id}"
-        expect(response).to have_http_status(:found)
-      end
-
-      it "decrease total listings count by 1" do
-        expect do
-          delete "/listings/#{listing_draft.id}"
-        end.to change(ClassifiedListing, :count).by(-1)
-      end
-    end
-
-    context "when deleting listing" do
-      it "redirect to dashboard" do
-        delete "/listings/#{listing.id}"
-        expect(response).to redirect_to("/listings/dashboard")
-      end
-
-      it "have status 302 found" do
-        delete "/listings/#{listing.id}"
-        expect(response).to have_http_status(:found)
-      end
-
-      it "decrease total listings count by 1" do
-        expect do
-          delete "/listings/#{listing.id}"
-        end.to change(ClassifiedListing, :count).by(-1)
-      end
-    end
-
-    context "when deleting draft org listing" do
-      it "redirect to dashboard" do
-        delete "/listings/#{org_listing_draft.id}"
-        expect(response).to redirect_to("/listings/dashboard")
-      end
-
-      it "have status 302 found" do
-        delete "/listings/#{org_listing_draft.id}"
-        expect(response).to have_http_status(:found)
-      end
-
-      it "decrease total listings count by 1" do
-        expect do
-          delete "/listings/#{org_listing_draft.id}"
-        end.to change(ClassifiedListing, :count).by(-1)
-      end
-    end
-
-    context "when deleting org listing" do
-      it "redirect to dashboard" do
-        delete "/listings/#{org_listing.id}"
-        expect(response).to redirect_to("/listings/dashboard")
-      end
-
-      it "have status 302 found" do
-        delete "/listings/#{org_listing.id}"
-        expect(response).to have_http_status(:found)
-      end
-
-      it "decrease total listings count by 1" do
-        expect do
-          delete "/listings/#{org_listing.id}"
-        end.to change(ClassifiedListing, :count).by(-1)
-      end
-    end
-  end
-
-  describe "GET /delete_confirm" do
-    let!(:listing) { create(:classified_listing, user: user) }
-
-    before { sign_in user }
-
-    context "without classified listing" do
-      it "renders not_found" do
-        expect do
-          get "/listings/#{listing.category}/#{listing.slug}_1/delete_confirm"
-        end.to raise_error(ActiveRecord::RecordNotFound)
-      end
-    end
-  end
-end
diff --git a/spec/requests/credits_spec.rb b/spec/requests/credits_spec.rb
index f809ba4bd..c11c9967b 100644
--- a/spec/requests/credits_spec.rb
+++ b/spec/requests/credits_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe "Credits", type: :request do
       let(:params) { { spent: true, spent_at: Time.current } }
 
       it "shows listing purchases" do
-        listing = create(:classified_listing, user: user, title: "Awesome opportunity")
+        listing = create(:listing, user: user, title: "Awesome opportunity")
         purchase_params = { user: user, purchase_type: listing.class.name, purchase_id: listing.id }
         create(:credit, params.merge(purchase_params))
 
diff --git a/spec/requests/internal/classified_listings_spec.rb b/spec/requests/internal/listings_spec.rb
similarity index 61%
rename from spec/requests/internal/classified_listings_spec.rb
rename to spec/requests/internal/listings_spec.rb
index b66e13165..a027762d6 100644
--- a/spec/requests/internal/classified_listings_spec.rb
+++ b/spec/requests/internal/listings_spec.rb
@@ -2,29 +2,29 @@ require "rails_helper"
 
 RSpec.describe "/internal/listings", type: :request do
   let_it_be(:admin) { create(:user, :super_admin) }
-  let_it_be(:classified_listing) { create(:classified_listing, user_id: admin.id) }
+  let_it_be(:listing) { create(:listing, user_id: admin.id) }
 
   before do
-    allow(CacheBuster).to receive(:bust_classified_listings)
+    allow(CacheBuster).to receive(:bust_listings)
     sign_in admin
   end
 
   describe "PUT /internal/listings/:id" do
     it "clears listing cache" do
-      put internal_listing_path(id: classified_listing.id), params: {
-        classified_listing: { title: "updated" }
+      put internal_listing_path(id: listing.id), params: {
+        listing: { title: "updated" }
       }
       sidekiq_perform_enqueued_jobs
-      expect(CacheBuster).to have_received(:bust_classified_listings)
+      expect(CacheBuster).to have_received(:bust_listings)
     end
 
     describe "GET /internal/listings" do
-      let!(:unpublished_listing) { create(:classified_listing, published: false) }
+      let!(:unpublished_listing) { create(:listing, published: false) }
 
       it "shows published listings" do
         get internal_listings_path
 
-        expect(response.body).to include(CGI.escapeHTML(classified_listing.title))
+        expect(response.body).to include(CGI.escapeHTML(listing.title))
       end
 
       it "filters unpublished listings by default" do
@@ -42,7 +42,7 @@ RSpec.describe "/internal/listings", type: :request do
       it "filters by category" do
         get internal_listings_path(filter: "misc")
 
-        expect(response.body).not_to include(CGI.escapeHTML(classified_listing.title))
+        expect(response.body).not_to include(CGI.escapeHTML(listing.title))
       end
     end
   end
diff --git a/spec/requests/listings_spec.rb b/spec/requests/listings_spec.rb
index b4f98a714..e31972c90 100644
--- a/spec/requests/listings_spec.rb
+++ b/spec/requests/listings_spec.rb
@@ -1,15 +1,536 @@
 require "rails_helper"
 
 RSpec.describe "/listings", type: :request do
+  let_it_be_readonly(:edu_category) do
+    create(:listing_category, cost: 1)
+  end
+  let(:user) { create(:user) }
+  let(:listing_params) do
+    {
+      listing: {
+        title: "something",
+        body_markdown: "something else",
+        listing_category_id: edu_category.id,
+        tag_list: "",
+        contact_via_connect: true
+      }
+    }
+  end
+  let(:draft_params) do
+    {
+      listing: {
+        title: "this a draft",
+        body_markdown: "something draft",
+        listing_category_id: edu_category.id,
+        tag_list: "",
+        contact_via_connect: true,
+        action: "draft"
+      }
+    }
+  end
+
+  describe "GET /listings" do
+    let(:listing) { create(:listing, user: user) }
+    let(:expired_listing) { create(:listing, user: user) }
+
+    before do
+      sign_in user
+      create_list(:credit, 25, user: user)
+    end
+
+    it "returns text/html and has status 200" do
+      get "/listings"
+      expect(response.content_type).to eq("text/html")
+      expect(response).to have_http_status(:ok)
+    end
+
+    context "when the user has no params" do
+      it "shows all active listings" do
+        get "/listings"
+        expect(response.body).to include("listings-container")
+      end
+    end
+
+    context "when the user has category and slug params for active listing" do
+      it "shows that direct listing" do
+        get "/listings", params: { category: listing.category, slug: listing.slug }
+        expect(response.body).to include(CGI.escapeHTML(listing.title))
+      end
+    end
+
+    context "when the user has category and slug params for expired listing" do
+      it "shows only active listings from that category" do
+        expired_listing.published = false
+        expired_listing.save
+        get "/listings", params: { category: expired_listing.category, slug: expired_listing.slug }
+        expect(response.body).not_to include(CGI.escapeHTML(expired_listing.title))
+      end
+    end
+
+    context "when view is moderate" do
+      it "redirects to internal/listings/:id/edit" do
+        get "/listings", params: { view: "moderate", slug: listing.slug }
+        expect(response.redirect_url).to include("/internal/listings/#{listing.id}/edit")
+      end
+
+      it "without a slug raises an ActiveRecord::RecordNotFound error" do
+        expect do
+          get "/listings", params: { view: "moderate" }
+        end.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+
+  describe "GET /listings/new" do
+    before { sign_in user }
+
+    it "shows the option to create draft" do
+      get "/listings/new"
+      expect(response.body).to include "You will not be charged credits to save a draft."
+    end
+
+    context "when the user has no credits" do
+      it "shows the proper messages" do
+        get "/listings/new"
+        expect(response.body).to include "Listings Require Credits"
+        expect(response.body).to include "You need at least one credit to create a listing."
+      end
+    end
+
+    context "when the user has credits" do
+      it "shows the number of credits" do
+        random_number = rand(2..100)
+        create_list(:credit, random_number, user: user)
+        get "/listings/new"
+        expect(response.body).to include "You have #{random_number} credits available"
+      end
+    end
+
+    context "when the user has no credits and belongs to an organization" do
+      let(:organization) { create(:organization) }
+
+      before { create(:organization_membership, user_id: user.id, organization_id: organization.id) }
+
+      it "shows the proper message when both user and org have no credits" do
+        get "/listings/new"
+        expect(response.body).to include "Listings Require Credits"
+      end
+
+      it "shows the number of credits of the user if the user has credits but the org has no credits" do
+        random_number = rand(2..100)
+        create_list(:credit, random_number, user: user)
+        get "/listings/new"
+        expect(response.body).to include "You have #{random_number} credits available"
+      end
+
+      it "shows the number of credits of the organization if the org has credits" do
+        random_number = rand(2..100)
+        create_list(:credit, random_number, organization: organization)
+        get "/listings/new"
+        expect(response.body).to include "has <span id=\"org-credits-number\">#{random_number}</span> credits"
+      end
+
+      it "shows the number of credits of both the user and the organization if they both have credits" do
+        random_number = rand(2..100)
+        create_list(:credit, random_number, organization: organization)
+        create_list(:credit, random_number, user: user)
+        get "/listings/new"
+        expect(response.body).to include "has <span id=\"org-credits-number\">#{random_number}</span> credits"
+        expect(response.body).to include "You have #{random_number} credits available"
+      end
+    end
+  end
+
+  describe "POST /listings" do
+    before do
+      sign_in user
+      create_list(:credit, 25, user: user)
+    end
+
+    let_it_be_readonly(:cfp_category) { create(:listing_category, :cfp) }
+
+    context "when the listing is invalid" do
+      let(:invalid_params) do
+        {
+          listing: {
+            title: "nothing",
+            body_markdown: "",
+            listing_category_id: cfp_category.id,
+            tag_list: ""
+          }
+        }
+      end
+
+      it "renders errors with the listing" do
+        post "/listings", params: invalid_params
+        expect(response.body).to include("prohibited this listing from being saved")
+      end
+
+      it "does not subtract credits or create a listing if the listing is not valid" do
+        expect do
+          post "/listings", params: invalid_params
+        end.to change(Listing, :count).by(0).
+          and change(user.credits.spent, :size).by(0)
+      end
+    end
+
+    context "when the listing is valid" do
+      it "redirects if the user does not have enough credits" do
+        Credit.delete_all
+        post "/listings", params: listing_params
+        expect(response.body).to redirect_to("/credits")
+      end
+
+      it "redirects if the org does not have enough credits" do
+        org_admin = create(:user, :org_admin)
+        listing_params[:listing][:post_as_organization] = "1"
+        sign_in org_admin
+        post "/listings", params: listing_params
+        expect(response.body).to redirect_to("/credits")
+      end
+
+      it "redirects to /listings/dashboard for listing draft" do
+        post "/listings", params: draft_params
+        expect(response).to redirect_to "/listings/dashboard"
+      end
+
+      it "redirects to /listings" do
+        post "/listings", params: listing_params
+        expect(response).to redirect_to "/listings"
+      end
+
+      it "properly deducts the amount of credits" do
+        expect do
+          post "/listings", params: listing_params
+        end.to change { user.credits.spent.size }.by(edu_category.cost)
+      end
+
+      it "creates a listing draft under the org" do
+        org_admin = create(:user, :org_admin)
+        org_id = org_admin.organizations.first.id
+        Credit.create(organization_id: org_id)
+        draft_params[:listing][:organization_id] = org_id
+        sign_in org_admin
+        post "/listings", params: draft_params
+        expect(Listing.first.organization_id).to eq org_id
+      end
+
+      it "creates a listing under the org" do
+        org_admin = create(:user, :org_admin)
+        org_id = org_admin.organizations.first.id
+        Credit.create(organization_id: org_id)
+        listing_params[:listing][:organization_id] = org_id
+        sign_in org_admin
+        post "/listings", params: listing_params
+        expect(Listing.first.organization_id).to eq org_id
+      end
+
+      it "does not create a listing draft for an org not belonging to the user" do
+        org = create(:organization)
+        draft_params[:listing][:organization_id] = org.id
+        expect { post "/listings", params: draft_params }.to raise_error(Pundit::NotAuthorizedError)
+      end
+
+      it "does not create a listing for an org not belonging to the user" do
+        org = create(:organization)
+        listing_params[:listing][:organization_id] = org.id
+        expect { post "/listings", params: listing_params }.to raise_error(Pundit::NotAuthorizedError)
+      end
+
+      it "assigns the spent credits to the listing" do
+        post "/listings", params: listing_params
+        spent_credit = user.credits.spent.last
+        expect(spent_credit.purchase_type).to eq("Listing")
+        expect(spent_credit.spent_at).not_to be_nil
+      end
+
+      it "creates listing draft and does not subtract credits" do
+        allow(Credits::Buyer).to receive(:call).and_raise(ActiveRecord::Rollback)
+        expect do
+          post "/listings", params: draft_params
+        end.to change(Listing, :count).by(1).
+          and change(user.credits.spent, :size).by(0)
+      end
+
+      it "does not create a listing or subtract credits if the purchase does not go through" do
+        allow(Credits::Buyer).to receive(:call).and_raise(ActiveRecord::Rollback)
+        expect do
+          post "/listings", params: listing_params
+        end.to change(Listing, :count).by(0).
+          and change(user.credits.spent, :size).by(0)
+      end
+    end
+
+    context "when user is banned" do
+      it "raises error" do
+        user.add_role(:banned)
+        expect do
+          post "/listings", params: listing_params
+        end.to raise_error("SUSPENDED")
+      end
+    end
+  end
+
+  describe "PUT /listings/:id" do
+    let(:listing) { create(:listing, user: user) }
+    let(:listing_draft) { create(:listing, user: user) }
+    let(:organization) { create(:organization) }
+    let(:org_listing) { create(:listing, user: user, organization: organization) }
+    let(:org_listing_draft) { create(:listing, user: user, organization: organization) }
+
+    before do
+      sign_in user
+      listing_draft.update_columns(bumped_at: nil, published: false)
+      org_listing_draft.update_columns(bumped_at: nil, published: false)
+    end
+
+    context "when the bump action is called" do
+      let(:params) { { listing: { action: "bump" } } }
+
+      it "does not bump the user listing and redirects to credits if the user has not enough credits" do
+        previous_bumped_at = listing.bumped_at
+        put "/listings/#{listing.id}", params: params
+        expect(listing.reload.bumped_at.to_i).to eq(previous_bumped_at.to_i)
+        expect(response.body).to redirect_to("/credits")
+      end
+
+      it "does not subtract spent credits if the user has not enough credits" do
+        expect do
+          put "/listings/#{listing.id}", params: params
+        end.to change(user.credits.spent, :size).by(0)
+      end
+
+      it "does not bump the listing or subtract credits if the purchase does not go through" do
+        previous_bumped_at = listing.bumped_at
+        allow(Credits::Buyer).to receive(:call).and_raise(ActiveRecord::Rollback)
+        expect do
+          put "/listings/#{listing.id}", params: params
+        end.to change(user.credits.spent, :size).by(0)
+        expect(listing.reload.bumped_at.to_i).to eq(previous_bumped_at.to_i)
+      end
+
+      it "bumps the listing and subtract credits" do
+        cost = listing.cost
+        create_list(:credit, cost, user: user)
+        previous_bumped_at = listing.bumped_at
+        expect do
+          put "/listings/#{listing.id}", params: params
+        end.to change(user.credits.spent, :size).by(cost)
+        expect(listing.reload.bumped_at >= previous_bumped_at).to eq(true)
+      end
+
+      it "bumps the org listing using org credits before user credits" do
+        cost = org_listing.cost
+        create_list(:credit, cost, organization: organization)
+        create_list(:credit, cost, user: user)
+        previous_bumped_at = org_listing.bumped_at
+        expect do
+          put "/listings/#{org_listing.id}", params: params
+        end.to change(organization.credits.spent, :size).by(cost)
+        expect(org_listing.reload.bumped_at >= previous_bumped_at).to eq(true)
+      end
+
+      it "bumps the org listing using user credits if org credits insufficient and user credits are" do
+        cost = org_listing.cost
+        create_list(:credit, cost, user: user)
+        previous_bumped_at = org_listing.bumped_at
+        expect do
+          put "/listings/#{org_listing.id}", params: params
+        end.to change(user.credits.spent, :size).by(cost)
+        expect(org_listing.reload.bumped_at >= previous_bumped_at).to eq(true)
+      end
+    end
+
+    context "when the publish action is called" do
+      let(:params) { { listing: { action: "publish" } } }
+
+      it "publishes a draft and charges user credits if first publish" do
+        cost = listing_draft.cost
+        create_list(:credit, cost, user: user)
+        expect do
+          put "/listings/#{listing_draft.id}", params: params
+        end.to change(user.credits.spent, :size).by(cost)
+      end
+
+      it "publishes a draft and ensures published column is true" do
+        cost = listing_draft.cost
+        create_list(:credit, cost, user: user)
+        put "/listings/#{listing_draft.id}", params: params
+        expect(listing_draft.reload.published).to eq(true)
+      end
+
+      it "publishes an org draft and charges org credits if first publish" do
+        cost = org_listing_draft.cost
+        create_list(:credit, cost, organization: organization)
+        expect do
+          put "/listings/#{org_listing_draft.id}", params: params
+        end.to change(organization.credits.spent, :size).by(cost)
+      end
+
+      it "publishes an org draft and ensures published column is true" do
+        cost = org_listing_draft.cost
+        create_list(:credit, cost, organization: organization)
+        put "/listings/#{org_listing_draft.id}", params: params
+        expect(org_listing_draft.reload.published).to eq(true)
+      end
+
+      it "publishes a draft that was charged and is within 30 days of bump doesn't charge credits" do
+        listing.update_column(:published, false)
+        expect do
+          put "/listings/#{listing.id}", params: params
+        end.to change(user.credits.spent, :size).by(0)
+      end
+
+      it "publishes a draft that was charged and is within 30 days of bump and successfully sets published as true" do
+        listing.update_column(:published, false)
+        put "/listings/#{listing.id}", params: params
+        expect(listing.reload.published).to eq(true)
+      end
+
+      it "fails to publish draft and doesn't charge credits" do
+        expect do
+          put "/listings/#{listing_draft.id}", params: params
+        end.to change(user.credits.spent, :size).by(0)
+      end
+
+      it "fails to publish draft and published remains false" do
+        put "/listings/#{listing_draft.id}", params: params
+        expect(listing_draft.reload.published).to eq(false)
+      end
+    end
+
+    context "when the unpublish action is called" do
+      let(:params) { { listing: { action: "unpublish" } } }
+
+      it "unpublishes a published listing" do
+        put "/listings/#{listing.id}", params: params
+        expect(listing.reload.published).to eq(false)
+      end
+    end
+
+    context "when an update is attempted" do
+      it "does not update with an empty body markdown" do
+        put "/listings/#{listing.id}", params: { listing: { body_markdown: "" } }
+        expect(response.body).to include(CGI.escapeHTML("can't be blank"))
+        expect(listing.reload.body_markdown).not_to be_empty
+      end
+    end
+  end
+
+  describe "DEL /listings/:id" do
+    let!(:listing) { create(:listing, user: user) }
+    let!(:listing_draft) { create(:listing, user: user, bumped_at: nil, published: false) }
+    let(:organization) { create(:organization) }
+    let!(:org_listing) { create(:listing, user: user, organization: organization) }
+    let!(:org_listing_draft) do
+      create(:listing, user: user, organization: organization, bumped_at: nil, published: false)
+    end
+
+    before do
+      sign_in user
+    end
+
+    context "when deleting draft" do
+      it "redirect to dashboard" do
+        delete "/listings/#{listing_draft.id}"
+        expect(response).to redirect_to("/listings/dashboard")
+      end
+
+      it "have status 302 found" do
+        delete "/listings/#{listing_draft.id}"
+        expect(response).to have_http_status(:found)
+      end
+
+      it "decrease total listings count by 1" do
+        expect do
+          delete "/listings/#{listing_draft.id}"
+        end.to change(Listing, :count).by(-1)
+      end
+    end
+
+    context "when deleting listing" do
+      it "redirect to dashboard" do
+        delete "/listings/#{listing.id}"
+        expect(response).to redirect_to("/listings/dashboard")
+      end
+
+      it "have status 302 found" do
+        delete "/listings/#{listing.id}"
+        expect(response).to have_http_status(:found)
+      end
+
+      it "decrease total listings count by 1" do
+        expect do
+          delete "/listings/#{listing.id}"
+        end.to change(Listing, :count).by(-1)
+      end
+    end
+
+    context "when deleting draft org listing" do
+      it "redirect to dashboard" do
+        delete "/listings/#{org_listing_draft.id}"
+        expect(response).to redirect_to("/listings/dashboard")
+      end
+
+      it "have status 302 found" do
+        delete "/listings/#{org_listing_draft.id}"
+        expect(response).to have_http_status(:found)
+      end
+
+      it "decrease total listings count by 1" do
+        expect do
+          delete "/listings/#{org_listing_draft.id}"
+        end.to change(Listing, :count).by(-1)
+      end
+    end
+
+    context "when deleting org listing" do
+      it "redirect to dashboard" do
+        delete "/listings/#{org_listing.id}"
+        expect(response).to redirect_to("/listings/dashboard")
+      end
+
+      it "have status 302 found" do
+        delete "/listings/#{org_listing.id}"
+        expect(response).to have_http_status(:found)
+      end
+
+      it "decrease total listings count by 1" do
+        expect do
+          delete "/listings/#{org_listing.id}"
+        end.to change(Listing, :count).by(-1)
+      end
+    end
+  end
+
+  describe "GET /delete_confirm" do
+    let!(:listing) { create(:listing, user: user) }
+
+    before { sign_in user }
+
+    context "without listing" do
+      it "renders not_found" do
+        expect do
+          get "/listings/#{listing.category}/#{listing.slug}_1/delete_confirm"
+        end.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+end
+
+# TODO: [thepracticaldev/oss] We used to have 2 request spec files, listing_spec.rb
+# and classified_listing_spec.rb. This context contains the specs of the former,
+# but we should eventually unify them into one set to remove some redundancy.
+context "when running the specs that were previously in another file" do
   let(:user) { create(:user) }
   let(:organization) { create(:organization) }
-  let(:cl_category) { create(:classified_listing_category, cost: 1) }
+  let(:cl_category) { create(:listing_category, cost: 1) }
 
   let(:params) do
     {
-      classified_listing: {
+      listing: {
         title: "Hey",
-        classified_listing_category_id: cl_category.id,
+        listing_category_id: cl_category.id,
         body_markdown: "hey hey my my",
         tag_list: "ruby, rails, go"
       }
@@ -19,19 +540,19 @@ RSpec.describe "/listings", type: :request do
   describe "GET /listings" do
     it "has page content" do
       get "/listings"
-      expect(response.body).to include("classified-filters")
+      expect(response.body).to include("listing-filters")
     end
 
     it "has page content for category page" do
       get "/listings/saas"
-      expect(response.body).to include("classified-filters")
+      expect(response.body).to include("listing-filters")
     end
   end
 
   describe "GETS /listings/new" do
     it "has page content" do
       get "/listings"
-      expect(response.body).to include("classified-filters")
+      expect(response.body).to include("listing-filters")
     end
   end
 
@@ -43,7 +564,7 @@ RSpec.describe "/listings", type: :request do
 
     it "creates proper listing if credits are available" do
       post "/listings", params: params
-      expect(ClassifiedListing.last.processed_html).to include("hey my")
+      expect(Listing.last.processed_html).to include("hey my")
     end
 
     it "spends credits" do
@@ -54,32 +575,32 @@ RSpec.describe "/listings", type: :request do
 
     it "adds tags" do
       post "/listings", params: params
-      expect(ClassifiedListing.last.cached_tag_list).to include("rails")
+      expect(Listing.last.cached_tag_list).to include("rails")
     end
 
     it "creates the listing under the user" do
       post "/listings", params: params
-      expect(ClassifiedListing.last.user_id).to eq user.id
+      expect(Listing.last.user_id).to eq user.id
     end
 
     it "creates the listing for the user if no organization_id is selected" do
       create(:organization_membership, user_id: user.id, organization_id: organization.id)
       post "/listings", params: params
-      expect(ClassifiedListing.last.organization_id).to eq nil
-      expect(ClassifiedListing.last.user_id).to eq user.id
+      expect(Listing.last.organization_id).to eq nil
+      expect(Listing.last.user_id).to eq user.id
     end
 
     it "creates the listing for the organization" do
       create(:organization_membership, user_id: user.id, organization_id: organization.id)
-      params[:classified_listing][:organization_id] = organization.id
+      params[:listing][:organization_id] = organization.id
       post "/listings", params: params
-      expect(ClassifiedListing.last.organization_id).to eq(organization.id)
+      expect(Listing.last.organization_id).to eq(organization.id)
     end
 
     it "does not create an org listing if a different org member doesn't belong to the org" do
       another_org = create(:organization)
       create(:organization_membership, user_id: user.id, organization_id: another_org.id)
-      params[:classified_listing][:organization_id] = organization.id
+      params[:listing][:organization_id] = organization.id
       expect do
         post "/listings", params: params
       end.to raise_error Pundit::NotAuthorizedError
@@ -110,7 +631,7 @@ RSpec.describe "/listings", type: :request do
   end
 
   describe "GET /listings/edit" do
-    let(:classified_listing) { create(:classified_listing, user_id: user.id) }
+    let(:listing) { create(:listing, user_id: user.id) }
 
     before do
       create_list(:credit, 20, user_id: user.id)
@@ -118,13 +639,13 @@ RSpec.describe "/listings", type: :request do
     end
 
     it "has page content" do
-      get "/listings/#{classified_listing.id}/edit"
+      get "/listings/#{listing.id}/edit"
       expect(response.body).to include("You can bump your listing")
     end
   end
 
   describe "PUT /listings/:id" do
-    let(:classified_listing) { create(:classified_listing, user_id: user.id) }
+    let(:listing) { create(:listing, user_id: user.id) }
 
     before do
       create_list(:credit, 20, user_id: user.id)
@@ -132,49 +653,49 @@ RSpec.describe "/listings", type: :request do
     end
 
     it "updates bumped_at if action is bump" do
-      put "/listings/#{classified_listing.id}", params: {
-        classified_listing: { action: "bump" }
+      put "/listings/#{listing.id}", params: {
+        listing: { action: "bump" }
       }
-      expect(ClassifiedListing.last.bumped_at).to be > 10.seconds.ago
+      expect(Listing.last.bumped_at).to be > 10.seconds.ago
     end
 
     it "updates publish if action is unpublish" do
-      put "/listings/#{classified_listing.id}", params: {
-        classified_listing: { action: "unpublish" }
+      put "/listings/#{listing.id}", params: {
+        listing: { action: "unpublish" }
       }
-      expect(ClassifiedListing.last.published).to eq(false)
+      expect(Listing.last.published).to eq(false)
     end
 
     it "updates body_markdown" do
-      put "/listings/#{classified_listing.id}", params: {
-        classified_listing: { body_markdown: "hello new markdown" }
+      put "/listings/#{listing.id}", params: {
+        listing: { body_markdown: "hello new markdown" }
       }
-      expect(ClassifiedListing.last.body_markdown).to eq("hello new markdown")
+      expect(Listing.last.body_markdown).to eq("hello new markdown")
     end
 
     it "does not update body_markdown if not bumped/created recently" do
-      classified_listing.update_column(:bumped_at, 50.hours.ago)
-      put "/listings/#{classified_listing.id}", params: {
-        classified_listing: { body_markdown: "hello new markdown" }
+      listing.update_column(:bumped_at, 50.hours.ago)
+      put "/listings/#{listing.id}", params: {
+        listing: { body_markdown: "hello new markdown" }
       }
-      expect(ClassifiedListing.last.body_markdown).not_to eq("hello new markdown")
+      expect(Listing.last.body_markdown).not_to eq("hello new markdown")
     end
 
     it "updates other fields" do
-      put "/listings/#{classified_listing.id}", params: {
-        classified_listing: { body_markdown: "hello new markdown", title: "New title!", tag_list: "new, tags, hey" }
+      put "/listings/#{listing.id}", params: {
+        listing: { body_markdown: "hello new markdown", title: "New title!", tag_list: "new, tags, hey" }
       }
-      expect(ClassifiedListing.last.title).to eq("New title!")
-      expect(ClassifiedListing.last.cached_tag_list).to include("hey")
+      expect(Listing.last.title).to eq("New title!")
+      expect(Listing.last.cached_tag_list).to include("hey")
     end
 
     it "does not update other fields" do
-      classified_listing.update_column(:bumped_at, 50.hours.ago)
-      put "/listings/#{classified_listing.id}", params: {
-        classified_listing: { body_markdown: "hello new markdown", title: "New title!", tag_list: "new, tags, hey" }
+      listing.update_column(:bumped_at, 50.hours.ago)
+      put "/listings/#{listing.id}", params: {
+        listing: { body_markdown: "hello new markdown", title: "New title!", tag_list: "new, tags, hey" }
       }
-      expect(ClassifiedListing.last.title).not_to eq("New title!")
-      expect(ClassifiedListing.last.cached_tag_list).not_to include("hey")
+      expect(Listing.last.title).not_to eq("New title!")
+      expect(Listing.last.cached_tag_list).not_to include("hey")
     end
   end
 end
diff --git a/spec/requests/search_spec.rb b/spec/requests/search_spec.rb
index 333db92b5..307713cb1 100644
--- a/spec/requests/search_spec.rb
+++ b/spec/requests/search_spec.rb
@@ -40,16 +40,16 @@ RSpec.describe "Search", type: :request, proper_status: true do
     end
   end
 
-  describe "GET /search/classified_listings" do
+  describe "GET /search/listings" do
     let(:mock_documents) do
-      [{ "title" => "classified_listing1" }]
+      [{ "title" => "listing1" }]
     end
 
     it "returns json" do
-      allow(Search::ClassifiedListing).to receive(:search_documents).and_return(
+      allow(Search::Listing).to receive(:search_documents).and_return(
         mock_documents,
       )
-      get "/search/classified_listings"
+      get "/search/listings"
       expect(response.parsed_body).to eq("result" => mock_documents)
     end
   end
diff --git a/spec/requests/social_previews_spec.rb b/spec/requests/social_previews_spec.rb
index df26b61b1..3fc304ab5 100644
--- a/spec/requests/social_previews_spec.rb
+++ b/spec/requests/social_previews_spec.rb
@@ -135,7 +135,7 @@ RSpec.describe "SocialPreviews", type: :request do
   end
 
   describe "GET /social_previews/listing/:id" do
-    let(:listing) { create(:classified_listing, user_id: user.id) }
+    let(:listing) { create(:listing, user_id: user.id) }
 
     it "renders pretty category name" do
       get "/social_previews/listing/#{listing.id}"
diff --git a/spec/requests/stories_index_spec.rb b/spec/requests/stories_index_spec.rb
index c1652ff7a..884ac58c6 100644
--- a/spec/requests/stories_index_spec.rb
+++ b/spec/requests/stories_index_spec.rb
@@ -89,7 +89,7 @@ RSpec.describe "StoriesIndex", type: :request do
 
     it "shows listings" do
       user = create(:user)
-      listing = create(:classified_listing, user_id: user.id)
+      listing = create(:listing, user_id: user.id)
       get "/"
       expect(response.body).to include(CGI.escapeHTML(listing.title))
     end
diff --git a/spec/services/credits/buyer_spec.rb b/spec/services/credits/buyer_spec.rb
index 2c88f56d7..6c2e07e5f 100644
--- a/spec/services/credits/buyer_spec.rb
+++ b/spec/services/credits/buyer_spec.rb
@@ -3,7 +3,7 @@ require "rails_helper"
 RSpec.describe Credits::Buyer, type: :service do
   let(:user) { create(:user) }
   let(:org) { create(:organization) }
-  let(:listing) { create(:classified_listing, user: user) }
+  let(:listing) { create(:listing, user: user) }
 
   context "when not enough credits are available" do
     it "does not spend credits for the user" do
diff --git a/spec/services/credits/ledger_spec.rb b/spec/services/credits/ledger_spec.rb
index 309ff8783..30afaeab1 100644
--- a/spec/services/credits/ledger_spec.rb
+++ b/spec/services/credits/ledger_spec.rb
@@ -3,8 +3,8 @@ require "rails_helper"
 RSpec.describe Credits::Ledger, type: :service do
   let(:user) { create(:user) }
   let(:org) { create(:organization) }
-  let(:user_listing) { create(:classified_listing, user: user) }
-  let(:org_listing) { create(:classified_listing, organization: org) }
+  let(:user_listing) { create(:listing, user: user) }
+  let(:org_listing) { create(:listing, organization: org) }
   let(:sponsorship) { create(:sponsorship, user: user, organization: org) }
 
   def buy(purchaser, purchase, cost)
@@ -28,7 +28,7 @@ RSpec.describe Credits::Ledger, type: :service do
       expect(items.length).to be(1)
 
       item = items.first
-      expect(item.purchase.is_a?(ClassifiedListing)).to be(true)
+      expect(item.purchase.is_a?(Listing)).to be(true)
       expect(item.cost).to eq(3)
       expect(item.purchased_at.to_i >= start.to_i).to eq(true)
     end
diff --git a/spec/services/search/classified_listing_spec.rb b/spec/services/search/classified_listing_spec.rb
deleted file mode 100644
index d39e9920d..000000000
--- a/spec/services/search/classified_listing_spec.rb
+++ /dev/null
@@ -1,178 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Search::ClassifiedListing, type: :service do
-  describe "::search_documents", elasticsearch: "ClassifiedListing" do
-    let(:classified_listing) { create(:classified_listing) }
-
-    it "parses classified_listing document hits from search response" do
-      mock_search_response = { "hits" => { "hits" => {} } }
-      allow(described_class).to receive(:search) { mock_search_response }
-      described_class.search_documents(params: {})
-      expect(described_class).to have_received(:search).with(body: a_kind_of(Hash))
-    end
-
-    context "with a query" do
-      # classified_listing_search is a copy_to field including:
-      # body_markdown, location, slug, tags, and title
-      it "searches by classified_listing_search" do
-        classified_listing1 = create(:classified_listing, body_markdown: "# body_markdown with test")
-        classified_listing2 = create(:classified_listing, location: "a test location")
-        classified_listing3 = create(:classified_listing, title: "this test title is testing slug")
-        classified_listing4 = create(:classified_listing, tag_list: ["test"])
-        classified_listing5 = create(:classified_listing, title: "a test title")
-        classified_listings = [classified_listing1, classified_listing2, classified_listing3, classified_listing4, classified_listing5]
-        index_documents(classified_listings)
-
-        classified_listing_docs = described_class.search_documents(params: { size: 5, classified_listing_search: "test" })
-        expect(classified_listing_docs.count).to eq(5)
-        expect(classified_listing_docs.map { |t| t.dig("id") }).to match_array(classified_listings.map(&:id))
-      end
-    end
-
-    context "with a term filter" do
-      it "searches by category" do
-        new_category = create(:classified_listing_category, :cfp)
-        classified_listing.update(classified_listing_category_id: new_category.id)
-        index_documents(classified_listing)
-        params = { size: 5, category: new_category.slug }
-
-        classified_listing_docs = described_class.search_documents(params: params)
-        expect(classified_listing_docs.count).to eq(1)
-        expect(classified_listing_docs.first["id"]).to eq(classified_listing.id)
-      end
-
-      it "searches by contact_via_connect" do
-        classified_listing.update(contact_via_connect: true)
-        index_documents(classified_listing)
-        params = { size: 5, contact_via_connect: true }
-
-        classified_listing_docs = described_class.search_documents(params: params)
-        expect(classified_listing_docs.count).to eq(1)
-        expect(classified_listing_docs.first["id"]).to eq(classified_listing.id)
-      end
-
-      it "searches by location" do
-        classified_listing.update(location: "a location")
-        index_documents(classified_listing)
-        params = { size: 5, location: "location" }
-
-        classified_listing_docs = described_class.search_documents(params: params)
-        expect(classified_listing_docs.count).to eq(1)
-        expect(classified_listing_docs.first["id"]).to eq(classified_listing.id)
-      end
-
-      it "searches by slug" do
-        slug_classified_listing = create(:classified_listing, title: "A slug is created from this title in a callback")
-        index_documents(slug_classified_listing)
-        params = { size: 5, slug: "slug" }
-
-        classified_listing_docs = described_class.search_documents(params: params)
-        expect(classified_listing_docs.count).to eq(1)
-        expect(classified_listing_docs.first["id"]).to eq(slug_classified_listing.id)
-      end
-
-      it "searches by tags" do
-        classified_listing.update(tag_list: %w[beginners career])
-        index_documents(classified_listing)
-        params = { size: 5, tags: "career" }
-
-        classified_listing_docs = described_class.search_documents(params: params)
-        expect(classified_listing_docs.count).to eq(1)
-        expect(classified_listing_docs.first["id"]).to eq(classified_listing.id)
-      end
-
-      it "searches by title" do
-        classified_listing.update(title: "An Amazing Title")
-        index_documents(classified_listing)
-        params = { size: 5, title: "amazing" }
-
-        classified_listing_docs = described_class.search_documents(params: params)
-        expect(classified_listing_docs.count).to eq(1)
-        expect(classified_listing_docs.first["id"]).to eq(classified_listing.id)
-      end
-
-      it "searches by user_id" do
-        index_documents(classified_listing)
-        params = { size: 5, user_id: classified_listing.user_id }
-
-        classified_listing_docs = described_class.search_documents(params: params)
-        expect(classified_listing_docs.count).to eq(1)
-        expect(classified_listing_docs.first["id"]).to eq(classified_listing.id)
-      end
-
-      it "searches by bumped_at" do
-        classified_listing.update(bumped_at: 1.day.from_now)
-        index_documents(classified_listing)
-        params = { size: 5, bumped_at: { gt: Time.current } }
-
-        classified_listing_docs = described_class.search_documents(params: params)
-        expect(classified_listing_docs.count).to eq(1)
-        expect(classified_listing_docs.first["id"]).to eq(classified_listing.id)
-      end
-
-      it "searches by expires_at" do
-        classified_listing.update(expires_at: 1.day.ago)
-        index_documents(classified_listing)
-        params = { size: 5, expires_at: { lt: Time.current } }
-
-        classified_listing_docs = described_class.search_documents(params: params)
-        expect(classified_listing_docs.count).to eq(1)
-        expect(classified_listing_docs.first["id"]).to eq(classified_listing.id)
-      end
-    end
-
-    it "sorts documents for a given field" do
-      classified_listing = create(:classified_listing)
-      cfp = create(:classified_listing_category, :cfp)
-      classified_listing2 = create(:classified_listing, classified_listing_category_id: cfp.id)
-      index_documents([classified_listing, classified_listing2])
-      params = { size: 5, sort_by: "category", sort_direction: "asc" }
-
-      classified_listing_docs = described_class.search_documents(params: params)
-      expect(classified_listing_docs.count).to eq(2)
-      expect(classified_listing_docs.first["id"]).to eq(classified_listing2.id)
-      expect(classified_listing_docs.last["id"]).to eq(classified_listing.id)
-    end
-
-    it "sorts documents by bumped_at by default" do
-      classified_listing.update(bumped_at: 1.year.ago)
-      classified_listing2 = create(:classified_listing, bumped_at: Time.current)
-      index_documents([classified_listing, classified_listing2])
-      params = { size: 5 }
-
-      classified_listing_docs = described_class.search_documents(params: params)
-      expect(classified_listing_docs.count).to eq(2)
-      expect(classified_listing_docs.first["id"]).to eq(classified_listing2.id)
-      expect(classified_listing_docs.last["id"]).to eq(classified_listing.id)
-    end
-
-    it "paginates the results" do
-      classified_listing.update(bumped_at: 1.year.ago)
-      classified_listing2 = create(:classified_listing, bumped_at: Time.current)
-      index_documents([classified_listing, classified_listing2])
-      first_page_params = { page: 0, per_page: 1, sort_by: "bumped_at", order: "dsc" }
-
-      classified_listing_docs = described_class.search_documents(params: first_page_params)
-      expect(classified_listing_docs.first["id"]).to eq(classified_listing2.id)
-
-      second_page_params = { page: 1, per_page: 1, sort_by: "bumped_at", order: "dsc" }
-
-      classified_listing_docs = described_class.search_documents(params: second_page_params)
-      expect(classified_listing_docs.first["id"]).to eq(classified_listing.id)
-    end
-
-    it "returns an empty Array if no results are found" do
-      jobs_category = create(:classified_listing_category, :jobs)
-      classified_listing.update(classified_listing_category: jobs_category)
-
-      cfp_category = create(:classified_listing_category, :cfp)
-      classified_listing2 = create(:classified_listing,
-                                   classified_listing_category: cfp_category)
-      index_documents([classified_listing, classified_listing2])
-      params = { page: 3, per_page: 1 }
-
-      classified_listing_docs = described_class.search_documents(params: params)
-      expect(classified_listing_docs).to eq([])
-    end
-  end
-end
diff --git a/spec/services/search/listing_spec.rb b/spec/services/search/listing_spec.rb
new file mode 100644
index 000000000..c27237058
--- /dev/null
+++ b/spec/services/search/listing_spec.rb
@@ -0,0 +1,178 @@
+require "rails_helper"
+
+RSpec.describe Search::Listing, type: :service do
+  describe "::search_documents", elasticsearch: "Listing" do
+    let(:listing) { create(:listing) }
+
+    it "parses listing document hits from search response" do
+      mock_search_response = { "hits" => { "hits" => {} } }
+      allow(described_class).to receive(:search) { mock_search_response }
+      described_class.search_documents(params: {})
+      expect(described_class).to have_received(:search).with(body: a_kind_of(Hash))
+    end
+
+    context "with a query" do
+      # listing_search is a copy_to field including:
+      # body_markdown, location, slug, tags, and title
+      it "searches by listing_search" do
+        listing1 = create(:listing, body_markdown: "# body_markdown with test")
+        listing2 = create(:listing, location: "a test location")
+        listing3 = create(:listing, title: "this test title is testing slug")
+        listing4 = create(:listing, tag_list: ["test"])
+        listing5 = create(:listing, title: "a test title")
+        listings = [listing1, listing2, listing3, listing4, listing5]
+        index_documents(listings)
+
+        listing_docs = described_class.search_documents(params: { size: 5, listing_search: "test" })
+        expect(listing_docs.count).to eq(5)
+        expect(listing_docs.map { |t| t.dig("id") }).to match_array(listings.map(&:id))
+      end
+    end
+
+    context "with a term filter" do
+      it "searches by category" do
+        new_category = create(:listing_category, :cfp)
+        listing.update(listing_category_id: new_category.id)
+        index_documents(listing)
+        params = { size: 5, category: new_category.slug }
+
+        listing_docs = described_class.search_documents(params: params)
+        expect(listing_docs.count).to eq(1)
+        expect(listing_docs.first["id"]).to eq(listing.id)
+      end
+
+      it "searches by contact_via_connect" do
+        listing.update(contact_via_connect: true)
+        index_documents(listing)
+        params = { size: 5, contact_via_connect: true }
+
+        listing_docs = described_class.search_documents(params: params)
+        expect(listing_docs.count).to eq(1)
+        expect(listing_docs.first["id"]).to eq(listing.id)
+      end
+
+      it "searches by location" do
+        listing.update(location: "a location")
+        index_documents(listing)
+        params = { size: 5, location: "location" }
+
+        listing_docs = described_class.search_documents(params: params)
+        expect(listing_docs.count).to eq(1)
+        expect(listing_docs.first["id"]).to eq(listing.id)
+      end
+
+      it "searches by slug" do
+        slug_listing = create(:listing, title: "A slug is created from this title in a callback")
+        index_documents(slug_listing)
+        params = { size: 5, slug: "slug" }
+
+        listing_docs = described_class.search_documents(params: params)
+        expect(listing_docs.count).to eq(1)
+        expect(listing_docs.first["id"]).to eq(slug_listing.id)
+      end
+
+      it "searches by tags" do
+        listing.update(tag_list: %w[beginners career])
+        index_documents(listing)
+        params = { size: 5, tags: "career" }
+
+        listing_docs = described_class.search_documents(params: params)
+        expect(listing_docs.count).to eq(1)
+        expect(listing_docs.first["id"]).to eq(listing.id)
+      end
+
+      it "searches by title" do
+        listing.update(title: "An Amazing Title")
+        index_documents(listing)
+        params = { size: 5, title: "amazing" }
+
+        listing_docs = described_class.search_documents(params: params)
+        expect(listing_docs.count).to eq(1)
+        expect(listing_docs.first["id"]).to eq(listing.id)
+      end
+
+      it "searches by user_id" do
+        index_documents(listing)
+        params = { size: 5, user_id: listing.user_id }
+
+        listing_docs = described_class.search_documents(params: params)
+        expect(listing_docs.count).to eq(1)
+        expect(listing_docs.first["id"]).to eq(listing.id)
+      end
+
+      it "searches by bumped_at" do
+        listing.update(bumped_at: 1.day.from_now)
+        index_documents(listing)
+        params = { size: 5, bumped_at: { gt: Time.current } }
+
+        listing_docs = described_class.search_documents(params: params)
+        expect(listing_docs.count).to eq(1)
+        expect(listing_docs.first["id"]).to eq(listing.id)
+      end
+
+      it "searches by expires_at" do
+        listing.update(expires_at: 1.day.ago)
+        index_documents(listing)
+        params = { size: 5, expires_at: { lt: Time.current } }
+
+        listing_docs = described_class.search_documents(params: params)
+        expect(listing_docs.count).to eq(1)
+        expect(listing_docs.first["id"]).to eq(listing.id)
+      end
+    end
+
+    it "sorts documents for a given field" do
+      listing = create(:listing)
+      cfp = create(:listing_category, :cfp)
+      listing2 = create(:listing, listing_category_id: cfp.id)
+      index_documents([listing, listing2])
+      params = { size: 5, sort_by: "category", sort_direction: "asc" }
+
+      listing_docs = described_class.search_documents(params: params)
+      expect(listing_docs.count).to eq(2)
+      expect(listing_docs.first["id"]).to eq(listing2.id)
+      expect(listing_docs.last["id"]).to eq(listing.id)
+    end
+
+    it "sorts documents by bumped_at by default" do
+      listing.update(bumped_at: 1.year.ago)
+      listing2 = create(:listing, bumped_at: Time.current)
+      index_documents([listing, listing2])
+      params = { size: 5 }
+
+      listing_docs = described_class.search_documents(params: params)
+      expect(listing_docs.count).to eq(2)
+      expect(listing_docs.first["id"]).to eq(listing2.id)
+      expect(listing_docs.last["id"]).to eq(listing.id)
+    end
+
+    it "paginates the results" do
+      listing.update(bumped_at: 1.year.ago)
+      listing2 = create(:listing, bumped_at: Time.current)
+      index_documents([listing, listing2])
+      first_page_params = { page: 0, per_page: 1, sort_by: "bumped_at", order: "dsc" }
+
+      listing_docs = described_class.search_documents(params: first_page_params)
+      expect(listing_docs.first["id"]).to eq(listing2.id)
+
+      second_page_params = { page: 1, per_page: 1, sort_by: "bumped_at", order: "dsc" }
+
+      listing_docs = described_class.search_documents(params: second_page_params)
+      expect(listing_docs.first["id"]).to eq(listing.id)
+    end
+
+    it "returns an empty Array if no results are found" do
+      jobs_category = create(:listing_category, :jobs)
+      listing.update(listing_category: jobs_category)
+
+      cfp_category = create(:listing_category, :cfp)
+      listing2 = create(:listing,
+                        listing_category: cfp_category)
+      index_documents([listing, listing2])
+      params = { page: 3, per_page: 1 }
+
+      listing_docs = described_class.search_documents(params: params)
+      expect(listing_docs).to eq([])
+    end
+  end
+end
diff --git a/spec/services/search/query_builders/classified_listing_spec.rb b/spec/services/search/query_builders/listing_spec.rb
similarity index 95%
rename from spec/services/search/query_builders/classified_listing_spec.rb
rename to spec/services/search/query_builders/listing_spec.rb
index 622e1f66b..990e3d187 100644
--- a/spec/services/search/query_builders/classified_listing_spec.rb
+++ b/spec/services/search/query_builders/listing_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Search::QueryBuilders::ClassifiedListing, type: :service do
+RSpec.describe Search::QueryBuilders::Listing, type: :service do
   describe "::intialize" do
     it "sets params" do
       filter_params = { foo: "bar" }
@@ -59,7 +59,10 @@ RSpec.describe Search::QueryBuilders::ClassifiedListing, type: :service do
       filter = described_class.new(params: params)
       expected_query = [{
         "simple_query_string" => {
-          "query" => "test*", "fields" => [:classified_listing_search], "lenient" => true, "analyze_wildcard" => true
+          "query" => "test*",
+          "fields" => [:classified_listing_search],
+          "lenient" => true,
+          "analyze_wildcard" => true
         }
       }]
       expect(filter.as_hash.dig("query", "bool", "must")).to match_array(expected_query)
diff --git a/spec/workers/classified_listings/bust_cache_worker_spec.rb b/spec/workers/listings/bust_cache_worker_spec.rb
similarity index 60%
rename from spec/workers/classified_listings/bust_cache_worker_spec.rb
rename to spec/workers/listings/bust_cache_worker_spec.rb
index c6b89c9b2..44b135b23 100644
--- a/spec/workers/classified_listings/bust_cache_worker_spec.rb
+++ b/spec/workers/listings/bust_cache_worker_spec.rb
@@ -1,13 +1,13 @@
 require "rails_helper"
 
-RSpec.describe ClassifiedListings::BustCacheWorker, type: :worker do
+RSpec.describe Listings::BustCacheWorker, type: :worker do
   include_examples "#enqueues_on_correct_queue", "high_priority", 1
 
   describe "#perform" do
     let(:worker) { subject }
 
     before do
-      allow(CacheBuster).to receive(:bust_classified_listings)
+      allow(CacheBuster).to receive(:bust_listings)
     end
 
     context "with listing" do
@@ -15,13 +15,13 @@ RSpec.describe ClassifiedListings::BustCacheWorker, type: :worker do
       let(:listing_id) { 1 }
 
       before do
-        allow(ClassifiedListing).to receive(:find_by).with(id: listing_id).and_return(listing)
+        allow(Listing).to receive(:find_by).with(id: listing_id).and_return(listing)
       end
 
       it "busts cache" do
         worker.perform(listing_id)
 
-        expect(CacheBuster).to have_received(:bust_classified_listings).with(listing)
+        expect(CacheBuster).to have_received(:bust_listings).with(listing)
       end
     end
 
@@ -32,7 +32,7 @@ RSpec.describe ClassifiedListings::BustCacheWorker, type: :worker do
 
       it "does not bust cache" do
         worker.perform(nil)
-        expect(CacheBuster).not_to have_received(:bust_classified_listings)
+        expect(CacheBuster).not_to have_received(:bust_listings)
       end
     end
   end
diff --git a/spec/workers/moderator/banish_user_worker_spec.rb b/spec/workers/moderator/banish_user_worker_spec.rb
index 22b2a8abf..e14fb2101 100644
--- a/spec/workers/moderator/banish_user_worker_spec.rb
+++ b/spec/workers/moderator/banish_user_worker_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe Moderator::BanishUserWorker, type: :worker do
     before do
       create(:article, user_id: user.id)
       create(:article, user_id: user.id)
-      create(:classified_listing, user: user)
+      create(:listing, user: user)
       ChatChannel.create_with_users(users: [user, user2])
       user.follow(user2)
       described_class.new.perform(admin.id, user.id)
@@ -29,7 +29,7 @@ RSpec.describe Moderator::BanishUserWorker, type: :worker do
       expect(user.articles.count).to eq(0)
       expect(user.chat_channels.count).to eq(0)
       expect(user.follows.count).to eq(0)
-      expect(user.classified_listings.count).to eq(0)
+      expect(user.listings.count).to eq(0)
     end
 
     it "reassigns profile info" do