diff --git a/servers/puppet/modules/zulip/files/supervisord/conf.d/feedback-bot.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf
similarity index 100%
rename from servers/puppet/modules/zulip/files/supervisord/conf.d/feedback-bot.conf
rename to servers/puppet/modules/zulip/files/supervisor/conf.d/feedback-bot.conf
diff --git a/servers/puppet/modules/zulip/files/supervisord/conf.d/humbug.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/humbug.conf
similarity index 100%
rename from servers/puppet/modules/zulip/files/supervisord/conf.d/humbug.conf
rename to servers/puppet/modules/zulip/files/supervisor/conf.d/humbug.conf
diff --git a/servers/puppet/modules/zulip/files/supervisord/conf.d/stats.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf
similarity index 100%
rename from servers/puppet/modules/zulip/files/supervisord/conf.d/stats.conf
rename to servers/puppet/modules/zulip/files/supervisor/conf.d/stats.conf
diff --git a/servers/puppet/modules/zulip/files/supervisord/conf.d/zmirror.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf
similarity index 100%
rename from servers/puppet/modules/zulip/files/supervisord/conf.d/zmirror.conf
rename to servers/puppet/modules/zulip/files/supervisor/conf.d/zmirror.conf
diff --git a/servers/puppet/modules/zulip/files/supervisord/conf.d/zulip_db.conf b/servers/puppet/modules/zulip/files/supervisor/conf.d/zulip_db.conf
similarity index 100%
rename from servers/puppet/modules/zulip/files/supervisord/conf.d/zulip_db.conf
rename to servers/puppet/modules/zulip/files/supervisor/conf.d/zulip_db.conf
diff --git a/servers/puppet/modules/zulip/files/supervisord/supervisord.conf b/servers/puppet/modules/zulip/files/supervisor/supervisord.conf
similarity index 100%
rename from servers/puppet/modules/zulip/files/supervisord/supervisord.conf
rename to servers/puppet/modules/zulip/files/supervisor/supervisord.conf
diff --git a/servers/puppet/modules/zulip/manifests/app_frontend.pp b/servers/puppet/modules/zulip/manifests/app_frontend.pp
index 7f74236089..e1531c433f 100644
--- a/servers/puppet/modules/zulip/manifests/app_frontend.pp
+++ b/servers/puppet/modules/zulip/manifests/app_frontend.pp
@@ -42,7 +42,7 @@ class zulip::app_frontend {
     owner => "root",
     group => "root",
     mode => 644,
-    source => "puppet:///modules/zulip/supervisord/conf.d/humbug.conf",
+    source => "puppet:///modules/zulip/supervisor/conf.d/humbug.conf",
     notify => Service["supervisor"],
   }
   file { "/home/humbug/tornado":
diff --git a/servers/puppet/modules/zulip/manifests/bots.pp b/servers/puppet/modules/zulip/manifests/bots.pp
index 7b21cb2c97..093406df88 100644
--- a/servers/puppet/modules/zulip/manifests/bots.pp
+++ b/servers/puppet/modules/zulip/manifests/bots.pp
@@ -8,7 +8,7 @@ class zulip::bots {
     owner   => 'root',
     group   => 'root',
     mode    => 640,
-    source  => "puppet:///modules/zulip/supervisord/conf.d/feedback-bot.conf",
+    source  => "puppet:///modules/zulip/supervisor/conf.d/feedback-bot.conf",
     notify  => Service['supervisor'],
   }
 }
diff --git a/servers/puppet/modules/zulip/manifests/postgres-appdb.pp b/servers/puppet/modules/zulip/manifests/postgres-appdb.pp
index 8293631f7c..ccdaf83766 100644
--- a/servers/puppet/modules/zulip/manifests/postgres-appdb.pp
+++ b/servers/puppet/modules/zulip/manifests/postgres-appdb.pp
@@ -20,7 +20,7 @@ class zulip::postgres-appdb {
     owner => "root",
     group => "root",
     mode => 644,
-    source => "puppet:///modules/zulip/supervisord/conf.d/zulip_db.conf",
+    source => "puppet:///modules/zulip/supervisor/conf.d/zulip_db.conf",
     notify => Service[supervisor],
   }
 
diff --git a/servers/puppet/modules/zulip/manifests/supervisor.pp b/servers/puppet/modules/zulip/manifests/supervisor.pp
index 18237cd92a..81e8bab436 100644
--- a/servers/puppet/modules/zulip/manifests/supervisor.pp
+++ b/servers/puppet/modules/zulip/manifests/supervisor.pp
@@ -27,7 +27,7 @@ class zulip::supervisor {
     owner => "root",
     group => "root",
     mode => 644,
-    source => "puppet:///modules/zulip/supervisord/supervisord.conf",
+    source => "puppet:///modules/zulip/supervisor/supervisord.conf",
     notify => Service["supervisor"],
   }
 }
diff --git a/servers/puppet/modules/zulip/manifests/zmirror.pp b/servers/puppet/modules/zulip/manifests/zmirror.pp
index 476698a2f1..b474ab669b 100644
--- a/servers/puppet/modules/zulip/manifests/zmirror.pp
+++ b/servers/puppet/modules/zulip/manifests/zmirror.pp
@@ -19,7 +19,7 @@ class zulip::zmirror {
     owner => "root",
     group => "root",
     mode => 644,
-    source => "puppet:///modules/zulip/supervisord/conf.d/zmirror.conf",
+    source => "puppet:///modules/zulip/supervisor/conf.d/zmirror.conf",
     notify => Service["supervisor"],
   }