diff --git a/app/controllers/assignments/toggles_controller.rb b/app/controllers/assignments_controller.rb
similarity index 93%
rename from app/controllers/assignments/toggles_controller.rb
rename to app/controllers/assignments_controller.rb
index 96d510baa..554d86850 100644
--- a/app/controllers/assignments/toggles_controller.rb
+++ b/app/controllers/assignments_controller.rb
@@ -1,4 +1,4 @@
-class Assignments::TogglesController < ApplicationController
+class AssignmentsController < ApplicationController
   include BubbleScoped, BucketScoped
 
   def new
diff --git a/app/views/bubbles/_assignment.html.erb b/app/views/bubbles/_assignment.html.erb
index 2d6914591..7c6071a25 100644
--- a/app/views/bubbles/_assignment.html.erb
+++ b/app/views/bubbles/_assignment.html.erb
@@ -3,7 +3,7 @@
     <dialog class="popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog">
       <strong class="popup__title margin-block-start-half pad-inline-half txt-nowrap">Assign this to…</strong>
 
-      <%= form_with url: bucket_bubble_assignment_toggles_path(bubble.bucket, bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %>
+      <%= form_with url: bucket_bubble_assignments_path(bubble.bucket, bubble), class: "flex flex-column full-width popup__list", data: { controller: "form" } do |form| %>
         <% bubble.bucket.users.active.sort_by(&:name).each do |user| %>
           <div class="btn popup__item">
             <%= form.check_box "assignee_id[]", {
diff --git a/app/views/bubbles/cards/perma/_assignees.html.erb b/app/views/bubbles/cards/perma/_assignees.html.erb
index b9ef3d6db..91f3612a6 100644
--- a/app/views/bubbles/cards/perma/_assignees.html.erb
+++ b/app/views/bubbles/cards/perma/_assignees.html.erb
@@ -1,3 +1,3 @@
 <%= render "bubbles/cards/common/assignees", bubble: bubble do %>
-  <%= turbo_frame_tag bubble, :assignment, src: new_bucket_bubble_assignment_toggle_path(bubble.bucket, bubble) %>
+  <%= turbo_frame_tag bubble, :assignment, src: new_bucket_bubble_assignment_path(bubble.bucket, bubble) %>
 <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index eeac71f81..bd3e3b4d3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -57,9 +57,7 @@ Rails.application.routes.draw do
         resource :pin, only: [ :show, :create, :destroy ]
       end
 
-      namespace :assignments, as: :assignment do
-        resources :toggles
-      end
+      resources :assignments
 
       namespace :taggings, as: :tagging do
         resources :toggles
diff --git a/test/controllers/assignments/toggles_controller_test.rb b/test/controllers/assignments/toggles_controller_test.rb
deleted file mode 100644
index 3a1d4fcdb..000000000
--- a/test/controllers/assignments/toggles_controller_test.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "test_helper"
-
-class Assignments::TogglesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    sign_in_as :kevin
-  end
-
-  test "new" do
-    get new_bucket_bubble_assignment_toggle_url(buckets(:writebook), bubbles(:logo))
-
-    assert_response :success
-  end
-
-  test "create" do
-    assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: false, to: true do
-      post bucket_bubble_assignment_toggles_url(buckets(:writebook), bubbles(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream
-    end
-    assert_response :success
-
-    assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: true, to: false do
-      post bucket_bubble_assignment_toggles_url(buckets(:writebook), bubbles(:logo)), params: { assignee_id: users(:kevin).id }, as: :turbo_stream
-    end
-    assert_response :success
-  end
-end
diff --git a/test/controllers/assignments_controller_test.rb b/test/controllers/assignments_controller_test.rb
new file mode 100644
index 000000000..4bec58298
--- /dev/null
+++ b/test/controllers/assignments_controller_test.rb
@@ -0,0 +1,25 @@
+require "test_helper"
+
+class AssignmentsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in_as :kevin
+  end
+
+  test "new" do
+    get new_bucket_bubble_assignment_url(buckets(:writebook), bubbles(:logo))
+
+    assert_response :success
+  end
+
+  test "create" do
+    assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: false, to: true do
+      post bucket_bubble_assignments_url(buckets(:writebook), bubbles(:logo)), params: { assignee_id: users(:david).id }, as: :turbo_stream
+    end
+    assert_response :success
+
+    assert_changes "bubbles(:logo).assigned_to?(users(:david))", from: true, to: false do
+      post bucket_bubble_assignments_url(buckets(:writebook), bubbles(:logo)), params: { assignee_id: users(:kevin).id }, as: :turbo_stream
+    end
+    assert_response :success
+  end
+end