diff --git a/docker-compose/docker-compose.override.yml b/docker-compose/docker-compose.override.yml
index 255519e2c..412c98f09 100644
--- a/docker-compose/docker-compose.override.yml
+++ b/docker-compose/docker-compose.override.yml
@@ -7,8 +7,8 @@ services:
     ports:
       - "8080:80"
     volumes:
-      - ../reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
-      - ../reverse-proxy/loc-includes:/etc/nginx/loc-includes:ro
+      - ../reverse-proxy/server-includes:/etc/nginx/server-includes:ro
+      - ../reverse-proxy/location-includes:/etc/nginx/location-includes:ro
       - ../reverse-proxy/conf.d.dev:/etc/nginx/conf.d:ro
     command: ["nginx-debug", "-g", "daemon off;"]
 
diff --git a/docker-compose/docker-compose.prod.yml b/docker-compose/docker-compose.prod.yml
index c29f8936f..07655efd8 100644
--- a/docker-compose/docker-compose.prod.yml
+++ b/docker-compose/docker-compose.prod.yml
@@ -9,8 +9,8 @@ services:
     depends_on:
       - web
     volumes:
-      - ./reverse-proxy/svr-includes:/etc/nginx/svr-includes:ro
-      - ./reverse-proxy/loc-includes:/etc/nginx/loc-includes:ro
+      - ./reverse-proxy/server-includes:/etc/nginx/server-includes:ro
+      - ./reverse-proxy/location-includes:/etc/nginx/location-includes:ro
       - ./reverse-proxy/conf.d:/etc/nginx/conf.d:ro
       - ~/cert:/etc/nginx/cert:ro
 
diff --git a/reverse-proxy/azure-pipelines.yaml b/reverse-proxy/azure-pipelines.yaml
index d11446490..67b9f0d01 100644
--- a/reverse-proxy/azure-pipelines.yaml
+++ b/reverse-proxy/azure-pipelines.yaml
@@ -24,8 +24,8 @@ steps:
     inputs:
       SourceFolder: $(Build.SourcesDirectory)
       Contents: |
-        reverse-proxy/svr-includes/*
-        reverse-proxy/loc-includes/*
+        reverse-proxy/server-includes/*
+        reverse-proxy/location-includes/*
         reverse-proxy/conf.d/*
       TargetFolder: $(Build.ArtifactStagingDirectory)
       CleanTargetFolder: true
diff --git a/reverse-proxy/conf.d.dev/default.conf b/reverse-proxy/conf.d.dev/default.conf
index 2f107183f..89bb7fbf2 100644
--- a/reverse-proxy/conf.d.dev/default.conf
+++ b/reverse-proxy/conf.d.dev/default.conf
@@ -1,25 +1,22 @@
 server {
   listen 80 default_server;
-  include svr-includes/*;
+  include server-includes/*;
 
   location ^~ /api/archival/ {
     rewrite    ^/api/archival/(.*)$ /$1 break;
     proxy_pass http://archival-api:80;
-    include    loc-includes/*;
-    include    svr-includes/headers.conf;
+    include    location-includes/*;
   }
 
   location ^~ /api/directory/ {
     rewrite    ^/api/directory/(.*)$ /$1 break;
     proxy_pass http://directory-api:80;
-    include    loc-includes/*;
-    include    svr-includes/headers.conf;
+    include    location-includes/*;
   }
 
   location ^~ /api/ {
     rewrite    ^/api/(.*)$ /$1 break;
     proxy_pass http://api-docs:8080;
-    include    loc-includes/*;
-    include    svr-includes/headers.conf;
+    include    location-includes/*;
   }
 }
\ No newline at end of file
diff --git a/reverse-proxy/conf.d/default.conf b/reverse-proxy/conf.d/default.conf
index d0350d5b3..12b921b2f 100644
--- a/reverse-proxy/conf.d/default.conf
+++ b/reverse-proxy/conf.d/default.conf
@@ -1,35 +1,31 @@
 server {
   listen 443 default_server ssl http2;
   server_name filterlists.com;
-  include svr-includes/*;
+  include server-includes/*;
   ssl_certificate /etc/nginx/cert/filterlists_cert.pem;
   ssl_certificate_key /etc/nginx/cert/filterlists_key.pem;
   
   location ^~ /api/archival/ {
     rewrite    ^/api/archival/(.*)$ /$1 break;
     proxy_pass http://archival-api:80;
-    include    loc-includes/*;
-    include    svr-includes/headers.conf;
+    include    location-includes/*;
   }
 
   location ^~ /api/directory/ {
     rewrite    ^/api/directory/(.*)$ /$1 break;
     proxy_pass http://directory-api:80;
-    include    loc-includes/*;
-    include    svr-includes/headers.conf;
+    include    location-includes/*;
   }
 
   location ^~ /api/ {
     rewrite    ^/api/(.*)$ /$1 break;
     proxy_pass http://api-docs:8080;
-    include    loc-includes/*;
-    include    svr-includes/headers.conf;
+    include    location-includes/*;
   }
 
   location / {
     proxy_pass http://web:80;
-    include    loc-includes/*;
-    include    svr-includes/headers.conf;
+    include    location-includes/*;
   }
 }
 
@@ -37,7 +33,7 @@ server {
 server {
   listen 80 default_server;
   server_name filterlists.com;
-  include svr-includes/*;
+  include server-includes/*;
   return 301 https://filterlists.com$request_uri;
 }
 
@@ -46,7 +42,7 @@ server {
   listen 80;
   listen 443 ssl http2;
   server_name www.filterlists.com;
-  include svr-includes/*;
+  include server-includes/*;
   ssl_certificate /etc/nginx/cert/filterlists_cert.pem;
   ssl_certificate_key /etc/nginx/cert/filterlists_key.pem;  
   return 301 https://filterlists.com$request_uri;
diff --git a/reverse-proxy/loc-includes/cors.conf b/reverse-proxy/loc-includes/cors.conf
deleted file mode 100644
index 84f1c78c8..000000000
--- a/reverse-proxy/loc-includes/cors.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# https://enable-cors.org/server_nginx.html
-#
-# Wide-open CORS config for nginx
-#
-if ($request_method = 'OPTIONS') {
-   add_header 'Access-Control-Allow-Origin' '*';
-   add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-   #
-   # Custom headers and headers various browsers *should* be OK with but aren't
-   #
-   add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-   #
-   # Tell client that this pre-flight info is valid for 20 days
-   #
-   add_header 'Access-Control-Max-Age' 1728000;
-   add_header 'Content-Type' 'text/plain; charset=utf-8';
-   add_header 'Content-Length' 0;
-   return 204;
-}
-if ($request_method = 'POST') {
-   add_header 'Access-Control-Allow-Origin' '*';
-   add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-   add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-   add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
-}
-if ($request_method = 'GET') {
-   add_header 'Access-Control-Allow-Origin' '*';
-   add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-   add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-   add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
-}
\ No newline at end of file
diff --git a/reverse-proxy/location-includes/cors.conf b/reverse-proxy/location-includes/cors.conf
new file mode 100644
index 000000000..518c285ea
--- /dev/null
+++ b/reverse-proxy/location-includes/cors.conf
@@ -0,0 +1,31 @@
+# # https://enable-cors.org/server_nginx.html
+# #
+# # Wide-open CORS config for nginx
+# #
+# if ($request_method = 'OPTIONS') {
+#    add_header 'Access-Control-Allow-Origin' '*';
+#    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+#    #
+#    # Custom headers and headers various browsers *should* be OK with but aren't
+#    #
+#    add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+#    #
+#    # Tell client that this pre-flight info is valid for 20 days
+#    #
+#    add_header 'Access-Control-Max-Age' 1728000;
+#    add_header 'Content-Type' 'text/plain; charset=utf-8';
+#    add_header 'Content-Length' 0;
+#    return 204;
+# }
+# if ($request_method = 'POST') {
+#    add_header 'Access-Control-Allow-Origin' '*';
+#    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+#    add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+#    add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
+# }
+# if ($request_method = 'GET') {
+#    add_header 'Access-Control-Allow-Origin' '*';
+#    add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+#    add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+#    add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
+# }
\ No newline at end of file
diff --git a/reverse-proxy/loc-includes/proxy.conf b/reverse-proxy/location-includes/proxy.conf
similarity index 100%
rename from reverse-proxy/loc-includes/proxy.conf
rename to reverse-proxy/location-includes/proxy.conf
diff --git a/reverse-proxy/svr-includes/headers.conf b/reverse-proxy/server-includes/headers.conf
similarity index 100%
rename from reverse-proxy/svr-includes/headers.conf
rename to reverse-proxy/server-includes/headers.conf
diff --git a/reverse-proxy/svr-includes/security.conf b/reverse-proxy/server-includes/security.conf
similarity index 100%
rename from reverse-proxy/svr-includes/security.conf
rename to reverse-proxy/server-includes/security.conf