From 5ae5632684d32bf68885b794bf169d9612dd657d Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Mon, 29 Jul 2024 16:35:38 -0500
Subject: [PATCH] refactor: apcd-cms to apcd_cms (#296)

* refactor:(apcd): rename from apcd-cms to apcd_cms

* fix(apcd): preserve envs via COMPOSE_PROJECT_NAME

* chore(apcd): reove temp workflow
---
 .github/workflows/apcd-cms-with-_.yml         |  39 ------------------
 .github/workflows/apcd-cms.yml                |   6 +--
 {apcd-cms => apcd_cms}/.dockerignore          |   0
 apcd_cms/.env                                 |   1 +
 {apcd-cms => apcd_cms}/Dockerfile             |   0
 {apcd-cms => apcd_cms}/Makefile               |   0
 {apcd-cms => apcd_cms}/README.md              |   0
 {apcd-cms => apcd_cms}/docker-compose.dev.yml |   0
 {apcd-cms => apcd_cms}/elasticsearch.yml      |   0
 {apcd-cms => apcd_cms}/src/__init__.py        |   0
 .../src/apps/admin_exception/__init__.py      |   0
 .../src/apps/admin_exception/apps.py          |   0
 .../static/admin_exception/css/modal.css      |   0
 .../static/admin_exception/css/table.css      |   0
 .../templates/edit_exception_error.html       |   0
 .../templates/edit_exception_modal.html       |   2 +-
 .../templates/edit_exception_success.html     |   0
 .../templates/list_admin_exception.html       |   2 +-
 .../templates/view_admin_exception_modal.html |   2 +-
 .../src/apps/admin_exception/urls.py          |   0
 .../src/apps/admin_exception/views.py         |   0
 .../src/apps/admin_extension/__init__.py      |   0
 .../src/apps/admin_extension/apps.py          |   0
 .../static/admin_extension/css/modal.css      |   0
 .../static/admin_extension/css/table.css      |   0
 .../templates/edit_extension_error.html       |   0
 .../templates/edit_extension_modal.html       |   2 +-
 .../templates/edit_extension_success.html     |   0
 .../templates/list_admin_extension.html       |   2 +-
 .../templates/view_admin_extension_modal.html |   2 +-
 .../src/apps/admin_extension/urls.py          |   0
 .../src/apps/admin_extension/views.py         |   0
 .../src/apps/admin_regis_table/__init__.py    |   0
 .../src/apps/admin_regis_table/apps.py        |   0
 .../static/admin_regis_table/css/table.css    |   0
 .../templates/create_submitter_error.html     |   0
 .../templates/create_submitter_modal.html     |   0
 .../templates/create_submitter_success.html   |   0
 .../templates/edit_registration_error.html    |   0
 .../templates/edit_registration_modal.html    |   0
 .../templates/edit_registration_success.html  |   0
 .../templates/list_registrations.html         |   4 +-
 .../templates/view_registration_modal.html    |   0
 .../src/apps/admin_regis_table/urls.py        |   0
 .../src/apps/admin_regis_table/views.py       |   0
 .../src/apps/admin_submissions/__init__.py    |   0
 .../src/apps/admin_submissions/apps.py        |   0
 .../admin_submissions/css/admin_table.css     |   0
 .../templates/list_admin_submissions.html     |   4 +-
 .../view_admin_submission_logs_modal.html     |   0
 .../src/apps/admin_submissions/urls.py        |   0
 .../src/apps/admin_submissions/views.py       |   0
 .../src/apps/apcd_login/__init__.py           |   0
 .../src/apps/apcd_login/apps.py               |   0
 .../src/apps/apcd_login/auth.py               |   0
 .../src/apps/apcd_login/urls.py               |   0
 .../src/apps/components/paginator/__init__.py |   0
 .../apps/components/paginator/paginator.py    |   0
 .../static/paginator/css/paginator.css        |   0
 .../paginator/templates/paginator.html        |   0
 .../src/apps/custom_example/__init__.py       |   0
 .../src/apps/custom_example/apps.py           |   0
 .../custom_example/custom_example.html        |   0
 .../src/apps/custom_example/urls.py           |   0
 .../src/apps/custom_example/views.py          |   0
 .../src/apps/exception/__init__.py            |   0
 .../src/apps/exception/apps.py                |   0
 .../forms/css/exception_submission_form.css   |   0
 .../exception_err_no_sub_id.html              |   0
 .../exception_form_success.html               |   0
 .../exception_other_form.html                 |   0
 .../exception_selection_page.html             |   0
 .../exception_submission_error.html           |   0
 .../exception_threshold_form.html             |   0
 .../src/apps/exception/urls.py                |   0
 .../src/apps/exception/views.py               |   0
 .../src/apps/extension/__init__.py            |   0
 .../src/apps/extension/apps.py                |   0
 .../forms/css/extension_submission_form.css   |   0
 .../extension_err_no_sub_id.html              |   0
 .../extension_form_success.html               |   0
 .../extension_submission_error.html           |   0
 .../extension_submission_form.html            |   0
 .../src/apps/extension/urls.py                |   0
 .../src/apps/extension/views.py               |   0
 .../src/apps/registrations/__init__.py        |   0
 .../src/apps/registrations/apps.py            |   0
 .../registrations/css/submission_form.css     |   0
 .../registration_form_body.html               |   0
 .../registration_form_scripts.html            |   0
 .../submission_form/submission_error.html     |   0
 .../submission_form/submission_form.html      |   0
 .../submission_form/submission_success.html   |   0
 .../src/apps/registrations/urls.py            |   0
 .../src/apps/registrations/views.py           |   0
 .../src/apps/submissions/__init__.py          |   0
 .../src/apps/submissions/apps.py              |   0
 .../static/submissions/css/modal.css          |   0
 .../static/submissions/css/table.css          |   0
 .../templates/list_submissions.html           |   4 +-
 .../templates/view_submission_logs_modal.html |   0
 .../src/apps/submissions/urls.py              |   0
 .../src/apps/submissions/views.py             |   0
 .../submitter_renewals_listing/__init__.py    |   0
 .../apps/submitter_renewals_listing/apps.py   |   0
 .../submitter_renewals_listing/css/table.css  |   0
 .../list_submitter_registrations.html         |   4 +-
 .../templates/submitter_listing_error.html    |   0
 .../apps/submitter_renewals_listing/urls.py   |   0
 .../apps/submitter_renewals_listing/views.py  |   0
 .../src/apps/utils/__init__.py                |   0
 .../src/apps/utils/apcd_database.py           |   0
 .../src/apps/utils/apcd_groups.py             |   0
 .../utils/registrations_data_formatting.py    |   0
 .../static/utils/js/checkForBlankInputs.js    |   0
 .../src/apps/utils/utils.py                   |   0
 .../src/apps/view_users/__init__.py           |   0
 .../src/apps/view_users/apps.py               |   0
 .../static/view_users_table/css/modal.css     |   0
 .../static/view_users_table/css/table.css     |   0
 .../templates/view_user_edit_error.html       |   0
 .../templates/view_user_edit_modal.html       |   2 +-
 .../templates/view_user_edit_success.html     |   0
 .../view_users/templates/view_user_modal.html |   2 +-
 .../apps/view_users/templates/view_users.html |   4 +-
 .../src/apps/view_users/urls.py               |   0
 .../src/apps/view_users/views.py              |   0
 .../src/taccsite_cms/custom_app_settings.py   |   0
 .../templates/guides/getting_started.tam.html |   0
 .../templatetags/limit_visibility_in_menu.py  |   0
 .../src/taccsite_cms/urls_custom.py           |   0
 .../css/modal--conflicts-with-core.css        |   0
 .../apcd_cms/static/apcd_cms}/css/modal.css   |   0
 .../static/apcd_cms}/css/site.cms.css         |   0
 .../css/table--conflicts-with-core.css        |   0
 .../apcd_cms/static/apcd_cms}/css/table.css   |   0
 .../static/apcd_cms}/img/favicons/favicon.ico | Bin
 .../apcd_cms}/img/org_logos/apcd-black.png    | Bin
 .../apcd_cms}/img/org_logos/apcd-white.png    | Bin
 .../apcd_cms}/img/org_logos/tacc-white.png    | Bin
 .../apcd_cms/templates/assets_custom.html     |   2 +-
 ...up-175-css-alerts-messages-ui-pattern.html |   0
 142 files changed, 23 insertions(+), 61 deletions(-)
 delete mode 100644 .github/workflows/apcd-cms-with-_.yml
 rename {apcd-cms => apcd_cms}/.dockerignore (100%)
 create mode 100644 apcd_cms/.env
 rename {apcd-cms => apcd_cms}/Dockerfile (100%)
 rename {apcd-cms => apcd_cms}/Makefile (100%)
 rename {apcd-cms => apcd_cms}/README.md (100%)
 rename {apcd-cms => apcd_cms}/docker-compose.dev.yml (100%)
 rename {apcd-cms => apcd_cms}/elasticsearch.yml (100%)
 rename {apcd-cms => apcd_cms}/src/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/static/admin_exception/css/modal.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/static/admin_exception/css/table.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/templates/edit_exception_error.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/templates/edit_exception_modal.html (99%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/templates/edit_exception_success.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/templates/list_admin_exception.html (98%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/templates/view_admin_exception_modal.html (98%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_exception/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/static/admin_extension/css/modal.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/static/admin_extension/css/table.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/templates/edit_extension_error.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/templates/edit_extension_modal.html (98%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/templates/edit_extension_success.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/templates/list_admin_extension.html (98%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/templates/view_admin_extension_modal.html (98%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_extension/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/static/admin_regis_table/css/table.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/templates/create_submitter_error.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/templates/create_submitter_modal.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/templates/create_submitter_success.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/templates/edit_registration_error.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/templates/edit_registration_modal.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/templates/edit_registration_success.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/templates/list_registrations.html (97%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/templates/view_registration_modal.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_regis_table/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_submissions/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_submissions/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_submissions/static/admin_submissions/css/admin_table.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_submissions/templates/list_admin_submissions.html (96%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_submissions/templates/view_admin_submission_logs_modal.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_submissions/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/admin_submissions/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/apcd_login/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/apcd_login/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/apcd_login/auth.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/apcd_login/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/components/paginator/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/components/paginator/paginator.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/components/paginator/static/paginator/css/paginator.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/components/paginator/templates/paginator.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/custom_example/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/custom_example/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/custom_example/templates/custom_example/custom_example.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/custom_example/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/custom_example/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/static/forms/css/exception_submission_form.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/templates/exception_submission_form/exception_err_no_sub_id.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/templates/exception_submission_form/exception_form_success.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/templates/exception_submission_form/exception_other_form.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/templates/exception_submission_form/exception_selection_page.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/templates/exception_submission_form/exception_submission_error.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/exception/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/extension/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/extension/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/extension/static/forms/css/extension_submission_form.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/extension/templates/extension_submission_form/extension_err_no_sub_id.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/extension/templates/extension_submission_form/extension_form_success.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/extension/templates/extension_submission_form/extension_submission_error.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/extension/templates/extension_submission_form/extension_submission_form.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/extension/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/extension/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/registrations/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/registrations/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/registrations/static/registrations/css/submission_form.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/registrations/templates/submission_form/registration_form_body.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/registrations/templates/submission_form/registration_form_scripts.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/registrations/templates/submission_form/submission_error.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/registrations/templates/submission_form/submission_form.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/registrations/templates/submission_form/submission_success.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/registrations/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/registrations/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submissions/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submissions/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submissions/static/submissions/css/modal.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submissions/static/submissions/css/table.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submissions/templates/list_submissions.html (96%)
 rename {apcd-cms => apcd_cms}/src/apps/submissions/templates/view_submission_logs_modal.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submissions/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submissions/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submitter_renewals_listing/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submitter_renewals_listing/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submitter_renewals_listing/static/submitter_renewals_listing/css/table.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html (97%)
 rename {apcd-cms => apcd_cms}/src/apps/submitter_renewals_listing/templates/submitter_listing_error.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submitter_renewals_listing/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/submitter_renewals_listing/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/utils/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/utils/apcd_database.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/utils/apcd_groups.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/utils/registrations_data_formatting.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/utils/static/utils/js/checkForBlankInputs.js (100%)
 rename {apcd-cms => apcd_cms}/src/apps/utils/utils.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/__init__.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/apps.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/static/view_users_table/css/modal.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/static/view_users_table/css/table.css (100%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/templates/view_user_edit_error.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/templates/view_user_edit_modal.html (98%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/templates/view_user_edit_success.html (100%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/templates/view_user_modal.html (97%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/templates/view_users.html (97%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/urls.py (100%)
 rename {apcd-cms => apcd_cms}/src/apps/view_users/views.py (100%)
 rename {apcd-cms => apcd_cms}/src/taccsite_cms/custom_app_settings.py (100%)
 rename {apcd-cms => apcd_cms}/src/taccsite_cms/templates/guides/getting_started.tam.html (100%)
 rename {apcd-cms => apcd_cms}/src/taccsite_cms/templatetags/limit_visibility_in_menu.py (100%)
 rename {apcd-cms => apcd_cms}/src/taccsite_cms/urls_custom.py (100%)
 rename {apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms => apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms}/css/modal--conflicts-with-core.css (100%)
 rename {apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms => apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms}/css/modal.css (100%)
 rename {apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms => apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms}/css/site.cms.css (100%)
 rename {apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms => apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms}/css/table--conflicts-with-core.css (100%)
 rename {apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms => apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms}/css/table.css (100%)
 rename {apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms => apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms}/img/favicons/favicon.ico (100%)
 rename {apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms => apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms}/img/org_logos/apcd-black.png (100%)
 rename {apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms => apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms}/img/org_logos/apcd-white.png (100%)
 rename {apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms => apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms}/img/org_logos/tacc-white.png (100%)
 rename {apcd-cms => apcd_cms}/src/taccsite_custom/apcd_cms/templates/assets_custom.html (91%)
 rename {apcd-cms => apcd_cms}/src/taccsite_custom/apcd_cms/templates/snippets/tup-175-css-alerts-messages-ui-pattern.html (100%)

diff --git a/.github/workflows/apcd-cms-with-_.yml b/.github/workflows/apcd-cms-with-_.yml
deleted file mode 100644
index f755629a..00000000
--- a/.github/workflows/apcd-cms-with-_.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: APCD CMS (with Underscore) Builds
-on:
-  workflow_dispatch:
-  push:
-    branches: [main]
-    paths:
-      - "apcd_cms/**"
-
-jobs:
-  build_commit:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: apcd_cms
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set shortsha and branch environment variables
-        id: vars
-        run: |
-          echo "BRANCH_NAME=$(echo ${GITHUB_REF_NAME} | sed 's/[^[:alnum:]\.\_\-]/-/g')" >> "$GITHUB_OUTPUT";
-          echo "SHORT_SHA=${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT";
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build & push commit tagged Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: apcd_cms
-          push: true
-          tags: taccwma/apcd-cms:${{ steps.vars.outputs.SHORT_SHA }},taccwma/apcd-cms:${{ steps.vars.outputs.BRANCH_NAME }}
diff --git a/.github/workflows/apcd-cms.yml b/.github/workflows/apcd-cms.yml
index 4b7d5643..a46a580b 100644
--- a/.github/workflows/apcd-cms.yml
+++ b/.github/workflows/apcd-cms.yml
@@ -4,14 +4,14 @@ on:
   push:
     branches: [main]
     paths:
-      - "apcd-cms/**"
+      - "apcd_cms/**"
 
 jobs:
   build_commit:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: apcd-cms
+        working-directory: apcd_cms
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -34,6 +34,6 @@ jobs:
       - name: Build & push commit tagged Docker image
         uses: docker/build-push-action@v5
         with:
-          context: apcd-cms
+          context: apcd_cms
           push: true
           tags: taccwma/apcd-cms:${{ steps.vars.outputs.SHORT_SHA }},taccwma/apcd-cms:${{ steps.vars.outputs.BRANCH_NAME }}
diff --git a/apcd-cms/.dockerignore b/apcd_cms/.dockerignore
similarity index 100%
rename from apcd-cms/.dockerignore
rename to apcd_cms/.dockerignore
diff --git a/apcd_cms/.env b/apcd_cms/.env
new file mode 100644
index 00000000..129c4153
--- /dev/null
+++ b/apcd_cms/.env
@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=apcd-cms
diff --git a/apcd-cms/Dockerfile b/apcd_cms/Dockerfile
similarity index 100%
rename from apcd-cms/Dockerfile
rename to apcd_cms/Dockerfile
diff --git a/apcd-cms/Makefile b/apcd_cms/Makefile
similarity index 100%
rename from apcd-cms/Makefile
rename to apcd_cms/Makefile
diff --git a/apcd-cms/README.md b/apcd_cms/README.md
similarity index 100%
rename from apcd-cms/README.md
rename to apcd_cms/README.md
diff --git a/apcd-cms/docker-compose.dev.yml b/apcd_cms/docker-compose.dev.yml
similarity index 100%
rename from apcd-cms/docker-compose.dev.yml
rename to apcd_cms/docker-compose.dev.yml
diff --git a/apcd-cms/elasticsearch.yml b/apcd_cms/elasticsearch.yml
similarity index 100%
rename from apcd-cms/elasticsearch.yml
rename to apcd_cms/elasticsearch.yml
diff --git a/apcd-cms/src/__init__.py b/apcd_cms/src/__init__.py
similarity index 100%
rename from apcd-cms/src/__init__.py
rename to apcd_cms/src/__init__.py
diff --git a/apcd-cms/src/apps/admin_exception/__init__.py b/apcd_cms/src/apps/admin_exception/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/admin_exception/__init__.py
rename to apcd_cms/src/apps/admin_exception/__init__.py
diff --git a/apcd-cms/src/apps/admin_exception/apps.py b/apcd_cms/src/apps/admin_exception/apps.py
similarity index 100%
rename from apcd-cms/src/apps/admin_exception/apps.py
rename to apcd_cms/src/apps/admin_exception/apps.py
diff --git a/apcd-cms/src/apps/admin_exception/static/admin_exception/css/modal.css b/apcd_cms/src/apps/admin_exception/static/admin_exception/css/modal.css
similarity index 100%
rename from apcd-cms/src/apps/admin_exception/static/admin_exception/css/modal.css
rename to apcd_cms/src/apps/admin_exception/static/admin_exception/css/modal.css
diff --git a/apcd-cms/src/apps/admin_exception/static/admin_exception/css/table.css b/apcd_cms/src/apps/admin_exception/static/admin_exception/css/table.css
similarity index 100%
rename from apcd-cms/src/apps/admin_exception/static/admin_exception/css/table.css
rename to apcd_cms/src/apps/admin_exception/static/admin_exception/css/table.css
diff --git a/apcd-cms/src/apps/admin_exception/templates/edit_exception_error.html b/apcd_cms/src/apps/admin_exception/templates/edit_exception_error.html
similarity index 100%
rename from apcd-cms/src/apps/admin_exception/templates/edit_exception_error.html
rename to apcd_cms/src/apps/admin_exception/templates/edit_exception_error.html
diff --git a/apcd-cms/src/apps/admin_exception/templates/edit_exception_modal.html b/apcd_cms/src/apps/admin_exception/templates/edit_exception_modal.html
similarity index 99%
rename from apcd-cms/src/apps/admin_exception/templates/edit_exception_modal.html
rename to apcd_cms/src/apps/admin_exception/templates/edit_exception_modal.html
index 7ded5ab4..577b58d9 100644
--- a/apcd-cms/src/apps/admin_exception/templates/edit_exception_modal.html
+++ b/apcd_cms/src/apps/admin_exception/templates/edit_exception_modal.html
@@ -1,5 +1,5 @@
 {% load static %}
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'admin_exception/css/modal.css' %}">
 <div id="editExceptionModal_{{r.exception_id}}" class="modal fade" role="dialog">
   <div class="modal-dialog modal-lg">
diff --git a/apcd-cms/src/apps/admin_exception/templates/edit_exception_success.html b/apcd_cms/src/apps/admin_exception/templates/edit_exception_success.html
similarity index 100%
rename from apcd-cms/src/apps/admin_exception/templates/edit_exception_success.html
rename to apcd_cms/src/apps/admin_exception/templates/edit_exception_success.html
diff --git a/apcd-cms/src/apps/admin_exception/templates/list_admin_exception.html b/apcd_cms/src/apps/admin_exception/templates/list_admin_exception.html
similarity index 98%
rename from apcd-cms/src/apps/admin_exception/templates/list_admin_exception.html
rename to apcd_cms/src/apps/admin_exception/templates/list_admin_exception.html
index 5d68c1cd..a14fd097 100644
--- a/apcd-cms/src/apps/admin_exception/templates/list_admin_exception.html
+++ b/apcd_cms/src/apps/admin_exception/templates/list_admin_exception.html
@@ -2,7 +2,7 @@
 {% load static %}
 
 {% block content %}
-<link rel="stylesheet" href="{% static 'apcd-cms/css/table.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/table.css' %}">
 <link rel="stylesheet" href="{% static 'admin_exception/css/table.css' %}">
 <div class="container">
   {% include "nav_cms_breadcrumbs.html" %}
diff --git a/apcd-cms/src/apps/admin_exception/templates/view_admin_exception_modal.html b/apcd_cms/src/apps/admin_exception/templates/view_admin_exception_modal.html
similarity index 98%
rename from apcd-cms/src/apps/admin_exception/templates/view_admin_exception_modal.html
rename to apcd_cms/src/apps/admin_exception/templates/view_admin_exception_modal.html
index ad088f39..f5410482 100644
--- a/apcd-cms/src/apps/admin_exception/templates/view_admin_exception_modal.html
+++ b/apcd_cms/src/apps/admin_exception/templates/view_admin_exception_modal.html
@@ -1,5 +1,5 @@
 {% load static %}
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'admin_exception/css/modal.css' %}">
 <div id="viewAdminExceptionsModal_{{r.exception_id}}" class="modal fade" role="dialog">
     <div class="modal-dialog modal-lg">
diff --git a/apcd-cms/src/apps/admin_exception/urls.py b/apcd_cms/src/apps/admin_exception/urls.py
similarity index 100%
rename from apcd-cms/src/apps/admin_exception/urls.py
rename to apcd_cms/src/apps/admin_exception/urls.py
diff --git a/apcd-cms/src/apps/admin_exception/views.py b/apcd_cms/src/apps/admin_exception/views.py
similarity index 100%
rename from apcd-cms/src/apps/admin_exception/views.py
rename to apcd_cms/src/apps/admin_exception/views.py
diff --git a/apcd-cms/src/apps/admin_extension/__init__.py b/apcd_cms/src/apps/admin_extension/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/admin_extension/__init__.py
rename to apcd_cms/src/apps/admin_extension/__init__.py
diff --git a/apcd-cms/src/apps/admin_extension/apps.py b/apcd_cms/src/apps/admin_extension/apps.py
similarity index 100%
rename from apcd-cms/src/apps/admin_extension/apps.py
rename to apcd_cms/src/apps/admin_extension/apps.py
diff --git a/apcd-cms/src/apps/admin_extension/static/admin_extension/css/modal.css b/apcd_cms/src/apps/admin_extension/static/admin_extension/css/modal.css
similarity index 100%
rename from apcd-cms/src/apps/admin_extension/static/admin_extension/css/modal.css
rename to apcd_cms/src/apps/admin_extension/static/admin_extension/css/modal.css
diff --git a/apcd-cms/src/apps/admin_extension/static/admin_extension/css/table.css b/apcd_cms/src/apps/admin_extension/static/admin_extension/css/table.css
similarity index 100%
rename from apcd-cms/src/apps/admin_extension/static/admin_extension/css/table.css
rename to apcd_cms/src/apps/admin_extension/static/admin_extension/css/table.css
diff --git a/apcd-cms/src/apps/admin_extension/templates/edit_extension_error.html b/apcd_cms/src/apps/admin_extension/templates/edit_extension_error.html
similarity index 100%
rename from apcd-cms/src/apps/admin_extension/templates/edit_extension_error.html
rename to apcd_cms/src/apps/admin_extension/templates/edit_extension_error.html
diff --git a/apcd-cms/src/apps/admin_extension/templates/edit_extension_modal.html b/apcd_cms/src/apps/admin_extension/templates/edit_extension_modal.html
similarity index 98%
rename from apcd-cms/src/apps/admin_extension/templates/edit_extension_modal.html
rename to apcd_cms/src/apps/admin_extension/templates/edit_extension_modal.html
index 336f922a..e5b81d52 100644
--- a/apcd-cms/src/apps/admin_extension/templates/edit_extension_modal.html
+++ b/apcd_cms/src/apps/admin_extension/templates/edit_extension_modal.html
@@ -1,5 +1,5 @@
 {% load static %}
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'admin_extension/css/modal.css' %}">
 <div id="editExtensionModal_{{r.extension_id}}" class="modal fade" role="dialog">
   <div class="modal-dialog modal-lg">
diff --git a/apcd-cms/src/apps/admin_extension/templates/edit_extension_success.html b/apcd_cms/src/apps/admin_extension/templates/edit_extension_success.html
similarity index 100%
rename from apcd-cms/src/apps/admin_extension/templates/edit_extension_success.html
rename to apcd_cms/src/apps/admin_extension/templates/edit_extension_success.html
diff --git a/apcd-cms/src/apps/admin_extension/templates/list_admin_extension.html b/apcd_cms/src/apps/admin_extension/templates/list_admin_extension.html
similarity index 98%
rename from apcd-cms/src/apps/admin_extension/templates/list_admin_extension.html
rename to apcd_cms/src/apps/admin_extension/templates/list_admin_extension.html
index e50c6e55..c7d3a134 100644
--- a/apcd-cms/src/apps/admin_extension/templates/list_admin_extension.html
+++ b/apcd_cms/src/apps/admin_extension/templates/list_admin_extension.html
@@ -2,7 +2,7 @@
 {% load static %}
 
 {% block content %}
-<link rel="stylesheet" href="{% static 'apcd-cms/css/table.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/table.css' %}">
 <link rel="stylesheet" href="{% static 'admin_extension/css/table.css' %}">
 
 <div class="container">
diff --git a/apcd-cms/src/apps/admin_extension/templates/view_admin_extension_modal.html b/apcd_cms/src/apps/admin_extension/templates/view_admin_extension_modal.html
similarity index 98%
rename from apcd-cms/src/apps/admin_extension/templates/view_admin_extension_modal.html
rename to apcd_cms/src/apps/admin_extension/templates/view_admin_extension_modal.html
index 4da1ad77..a5a0c355 100644
--- a/apcd-cms/src/apps/admin_extension/templates/view_admin_extension_modal.html
+++ b/apcd_cms/src/apps/admin_extension/templates/view_admin_extension_modal.html
@@ -1,5 +1,5 @@
 {% load static %}
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'admin_exception/css/modal.css' %}">
 <div id="viewAdminExtensionsModal_{{r.extension_id}}" class="modal fade" role="dialog">
     <div class="modal-dialog modal-lg">
diff --git a/apcd-cms/src/apps/admin_extension/urls.py b/apcd_cms/src/apps/admin_extension/urls.py
similarity index 100%
rename from apcd-cms/src/apps/admin_extension/urls.py
rename to apcd_cms/src/apps/admin_extension/urls.py
diff --git a/apcd-cms/src/apps/admin_extension/views.py b/apcd_cms/src/apps/admin_extension/views.py
similarity index 100%
rename from apcd-cms/src/apps/admin_extension/views.py
rename to apcd_cms/src/apps/admin_extension/views.py
diff --git a/apcd-cms/src/apps/admin_regis_table/__init__.py b/apcd_cms/src/apps/admin_regis_table/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/__init__.py
rename to apcd_cms/src/apps/admin_regis_table/__init__.py
diff --git a/apcd-cms/src/apps/admin_regis_table/apps.py b/apcd_cms/src/apps/admin_regis_table/apps.py
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/apps.py
rename to apcd_cms/src/apps/admin_regis_table/apps.py
diff --git a/apcd-cms/src/apps/admin_regis_table/static/admin_regis_table/css/table.css b/apcd_cms/src/apps/admin_regis_table/static/admin_regis_table/css/table.css
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/static/admin_regis_table/css/table.css
rename to apcd_cms/src/apps/admin_regis_table/static/admin_regis_table/css/table.css
diff --git a/apcd-cms/src/apps/admin_regis_table/templates/create_submitter_error.html b/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_error.html
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/templates/create_submitter_error.html
rename to apcd_cms/src/apps/admin_regis_table/templates/create_submitter_error.html
diff --git a/apcd-cms/src/apps/admin_regis_table/templates/create_submitter_modal.html b/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_modal.html
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/templates/create_submitter_modal.html
rename to apcd_cms/src/apps/admin_regis_table/templates/create_submitter_modal.html
diff --git a/apcd-cms/src/apps/admin_regis_table/templates/create_submitter_success.html b/apcd_cms/src/apps/admin_regis_table/templates/create_submitter_success.html
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/templates/create_submitter_success.html
rename to apcd_cms/src/apps/admin_regis_table/templates/create_submitter_success.html
diff --git a/apcd-cms/src/apps/admin_regis_table/templates/edit_registration_error.html b/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_error.html
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/templates/edit_registration_error.html
rename to apcd_cms/src/apps/admin_regis_table/templates/edit_registration_error.html
diff --git a/apcd-cms/src/apps/admin_regis_table/templates/edit_registration_modal.html b/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_modal.html
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/templates/edit_registration_modal.html
rename to apcd_cms/src/apps/admin_regis_table/templates/edit_registration_modal.html
diff --git a/apcd-cms/src/apps/admin_regis_table/templates/edit_registration_success.html b/apcd_cms/src/apps/admin_regis_table/templates/edit_registration_success.html
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/templates/edit_registration_success.html
rename to apcd_cms/src/apps/admin_regis_table/templates/edit_registration_success.html
diff --git a/apcd-cms/src/apps/admin_regis_table/templates/list_registrations.html b/apcd_cms/src/apps/admin_regis_table/templates/list_registrations.html
similarity index 97%
rename from apcd-cms/src/apps/admin_regis_table/templates/list_registrations.html
rename to apcd_cms/src/apps/admin_regis_table/templates/list_registrations.html
index 31466fd2..25f112fc 100644
--- a/apcd-cms/src/apps/admin_regis_table/templates/list_registrations.html
+++ b/apcd_cms/src/apps/admin_regis_table/templates/list_registrations.html
@@ -3,8 +3,8 @@
 
 {% block content %}
 
-<link rel="stylesheet" href="{% static 'apcd-cms/css/table.css' %}">
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/table.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'admin_regis_table/css/table.css' %}">
 
 <div class="container">
diff --git a/apcd-cms/src/apps/admin_regis_table/templates/view_registration_modal.html b/apcd_cms/src/apps/admin_regis_table/templates/view_registration_modal.html
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/templates/view_registration_modal.html
rename to apcd_cms/src/apps/admin_regis_table/templates/view_registration_modal.html
diff --git a/apcd-cms/src/apps/admin_regis_table/urls.py b/apcd_cms/src/apps/admin_regis_table/urls.py
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/urls.py
rename to apcd_cms/src/apps/admin_regis_table/urls.py
diff --git a/apcd-cms/src/apps/admin_regis_table/views.py b/apcd_cms/src/apps/admin_regis_table/views.py
similarity index 100%
rename from apcd-cms/src/apps/admin_regis_table/views.py
rename to apcd_cms/src/apps/admin_regis_table/views.py
diff --git a/apcd-cms/src/apps/admin_submissions/__init__.py b/apcd_cms/src/apps/admin_submissions/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/admin_submissions/__init__.py
rename to apcd_cms/src/apps/admin_submissions/__init__.py
diff --git a/apcd-cms/src/apps/admin_submissions/apps.py b/apcd_cms/src/apps/admin_submissions/apps.py
similarity index 100%
rename from apcd-cms/src/apps/admin_submissions/apps.py
rename to apcd_cms/src/apps/admin_submissions/apps.py
diff --git a/apcd-cms/src/apps/admin_submissions/static/admin_submissions/css/admin_table.css b/apcd_cms/src/apps/admin_submissions/static/admin_submissions/css/admin_table.css
similarity index 100%
rename from apcd-cms/src/apps/admin_submissions/static/admin_submissions/css/admin_table.css
rename to apcd_cms/src/apps/admin_submissions/static/admin_submissions/css/admin_table.css
diff --git a/apcd-cms/src/apps/admin_submissions/templates/list_admin_submissions.html b/apcd_cms/src/apps/admin_submissions/templates/list_admin_submissions.html
similarity index 96%
rename from apcd-cms/src/apps/admin_submissions/templates/list_admin_submissions.html
rename to apcd_cms/src/apps/admin_submissions/templates/list_admin_submissions.html
index 96af6d3e..8ca1ae0e 100644
--- a/apcd-cms/src/apps/admin_submissions/templates/list_admin_submissions.html
+++ b/apcd_cms/src/apps/admin_submissions/templates/list_admin_submissions.html
@@ -3,8 +3,8 @@
 
 {% block content %}
 
-<link rel="stylesheet" href="{% static 'apcd-cms/css/table.css' %}">
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/table.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'submissions/css/table.css' %}">
 <link rel="stylesheet" href="{% static 'submissions/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'admin_submissions/css/admin_table.css' %}">
diff --git a/apcd-cms/src/apps/admin_submissions/templates/view_admin_submission_logs_modal.html b/apcd_cms/src/apps/admin_submissions/templates/view_admin_submission_logs_modal.html
similarity index 100%
rename from apcd-cms/src/apps/admin_submissions/templates/view_admin_submission_logs_modal.html
rename to apcd_cms/src/apps/admin_submissions/templates/view_admin_submission_logs_modal.html
diff --git a/apcd-cms/src/apps/admin_submissions/urls.py b/apcd_cms/src/apps/admin_submissions/urls.py
similarity index 100%
rename from apcd-cms/src/apps/admin_submissions/urls.py
rename to apcd_cms/src/apps/admin_submissions/urls.py
diff --git a/apcd-cms/src/apps/admin_submissions/views.py b/apcd_cms/src/apps/admin_submissions/views.py
similarity index 100%
rename from apcd-cms/src/apps/admin_submissions/views.py
rename to apcd_cms/src/apps/admin_submissions/views.py
diff --git a/apcd-cms/src/apps/apcd_login/__init__.py b/apcd_cms/src/apps/apcd_login/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/apcd_login/__init__.py
rename to apcd_cms/src/apps/apcd_login/__init__.py
diff --git a/apcd-cms/src/apps/apcd_login/apps.py b/apcd_cms/src/apps/apcd_login/apps.py
similarity index 100%
rename from apcd-cms/src/apps/apcd_login/apps.py
rename to apcd_cms/src/apps/apcd_login/apps.py
diff --git a/apcd-cms/src/apps/apcd_login/auth.py b/apcd_cms/src/apps/apcd_login/auth.py
similarity index 100%
rename from apcd-cms/src/apps/apcd_login/auth.py
rename to apcd_cms/src/apps/apcd_login/auth.py
diff --git a/apcd-cms/src/apps/apcd_login/urls.py b/apcd_cms/src/apps/apcd_login/urls.py
similarity index 100%
rename from apcd-cms/src/apps/apcd_login/urls.py
rename to apcd_cms/src/apps/apcd_login/urls.py
diff --git a/apcd-cms/src/apps/components/paginator/__init__.py b/apcd_cms/src/apps/components/paginator/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/components/paginator/__init__.py
rename to apcd_cms/src/apps/components/paginator/__init__.py
diff --git a/apcd-cms/src/apps/components/paginator/paginator.py b/apcd_cms/src/apps/components/paginator/paginator.py
similarity index 100%
rename from apcd-cms/src/apps/components/paginator/paginator.py
rename to apcd_cms/src/apps/components/paginator/paginator.py
diff --git a/apcd-cms/src/apps/components/paginator/static/paginator/css/paginator.css b/apcd_cms/src/apps/components/paginator/static/paginator/css/paginator.css
similarity index 100%
rename from apcd-cms/src/apps/components/paginator/static/paginator/css/paginator.css
rename to apcd_cms/src/apps/components/paginator/static/paginator/css/paginator.css
diff --git a/apcd-cms/src/apps/components/paginator/templates/paginator.html b/apcd_cms/src/apps/components/paginator/templates/paginator.html
similarity index 100%
rename from apcd-cms/src/apps/components/paginator/templates/paginator.html
rename to apcd_cms/src/apps/components/paginator/templates/paginator.html
diff --git a/apcd-cms/src/apps/custom_example/__init__.py b/apcd_cms/src/apps/custom_example/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/custom_example/__init__.py
rename to apcd_cms/src/apps/custom_example/__init__.py
diff --git a/apcd-cms/src/apps/custom_example/apps.py b/apcd_cms/src/apps/custom_example/apps.py
similarity index 100%
rename from apcd-cms/src/apps/custom_example/apps.py
rename to apcd_cms/src/apps/custom_example/apps.py
diff --git a/apcd-cms/src/apps/custom_example/templates/custom_example/custom_example.html b/apcd_cms/src/apps/custom_example/templates/custom_example/custom_example.html
similarity index 100%
rename from apcd-cms/src/apps/custom_example/templates/custom_example/custom_example.html
rename to apcd_cms/src/apps/custom_example/templates/custom_example/custom_example.html
diff --git a/apcd-cms/src/apps/custom_example/urls.py b/apcd_cms/src/apps/custom_example/urls.py
similarity index 100%
rename from apcd-cms/src/apps/custom_example/urls.py
rename to apcd_cms/src/apps/custom_example/urls.py
diff --git a/apcd-cms/src/apps/custom_example/views.py b/apcd_cms/src/apps/custom_example/views.py
similarity index 100%
rename from apcd-cms/src/apps/custom_example/views.py
rename to apcd_cms/src/apps/custom_example/views.py
diff --git a/apcd-cms/src/apps/exception/__init__.py b/apcd_cms/src/apps/exception/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/exception/__init__.py
rename to apcd_cms/src/apps/exception/__init__.py
diff --git a/apcd-cms/src/apps/exception/apps.py b/apcd_cms/src/apps/exception/apps.py
similarity index 100%
rename from apcd-cms/src/apps/exception/apps.py
rename to apcd_cms/src/apps/exception/apps.py
diff --git a/apcd-cms/src/apps/exception/static/forms/css/exception_submission_form.css b/apcd_cms/src/apps/exception/static/forms/css/exception_submission_form.css
similarity index 100%
rename from apcd-cms/src/apps/exception/static/forms/css/exception_submission_form.css
rename to apcd_cms/src/apps/exception/static/forms/css/exception_submission_form.css
diff --git a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_err_no_sub_id.html b/apcd_cms/src/apps/exception/templates/exception_submission_form/exception_err_no_sub_id.html
similarity index 100%
rename from apcd-cms/src/apps/exception/templates/exception_submission_form/exception_err_no_sub_id.html
rename to apcd_cms/src/apps/exception/templates/exception_submission_form/exception_err_no_sub_id.html
diff --git a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_form_success.html b/apcd_cms/src/apps/exception/templates/exception_submission_form/exception_form_success.html
similarity index 100%
rename from apcd-cms/src/apps/exception/templates/exception_submission_form/exception_form_success.html
rename to apcd_cms/src/apps/exception/templates/exception_submission_form/exception_form_success.html
diff --git a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_other_form.html b/apcd_cms/src/apps/exception/templates/exception_submission_form/exception_other_form.html
similarity index 100%
rename from apcd-cms/src/apps/exception/templates/exception_submission_form/exception_other_form.html
rename to apcd_cms/src/apps/exception/templates/exception_submission_form/exception_other_form.html
diff --git a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_selection_page.html b/apcd_cms/src/apps/exception/templates/exception_submission_form/exception_selection_page.html
similarity index 100%
rename from apcd-cms/src/apps/exception/templates/exception_submission_form/exception_selection_page.html
rename to apcd_cms/src/apps/exception/templates/exception_submission_form/exception_selection_page.html
diff --git a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_submission_error.html b/apcd_cms/src/apps/exception/templates/exception_submission_form/exception_submission_error.html
similarity index 100%
rename from apcd-cms/src/apps/exception/templates/exception_submission_form/exception_submission_error.html
rename to apcd_cms/src/apps/exception/templates/exception_submission_form/exception_submission_error.html
diff --git a/apcd-cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html b/apcd_cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html
similarity index 100%
rename from apcd-cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html
rename to apcd_cms/src/apps/exception/templates/exception_submission_form/exception_threshold_form.html
diff --git a/apcd-cms/src/apps/exception/urls.py b/apcd_cms/src/apps/exception/urls.py
similarity index 100%
rename from apcd-cms/src/apps/exception/urls.py
rename to apcd_cms/src/apps/exception/urls.py
diff --git a/apcd-cms/src/apps/exception/views.py b/apcd_cms/src/apps/exception/views.py
similarity index 100%
rename from apcd-cms/src/apps/exception/views.py
rename to apcd_cms/src/apps/exception/views.py
diff --git a/apcd-cms/src/apps/extension/__init__.py b/apcd_cms/src/apps/extension/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/extension/__init__.py
rename to apcd_cms/src/apps/extension/__init__.py
diff --git a/apcd-cms/src/apps/extension/apps.py b/apcd_cms/src/apps/extension/apps.py
similarity index 100%
rename from apcd-cms/src/apps/extension/apps.py
rename to apcd_cms/src/apps/extension/apps.py
diff --git a/apcd-cms/src/apps/extension/static/forms/css/extension_submission_form.css b/apcd_cms/src/apps/extension/static/forms/css/extension_submission_form.css
similarity index 100%
rename from apcd-cms/src/apps/extension/static/forms/css/extension_submission_form.css
rename to apcd_cms/src/apps/extension/static/forms/css/extension_submission_form.css
diff --git a/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_err_no_sub_id.html b/apcd_cms/src/apps/extension/templates/extension_submission_form/extension_err_no_sub_id.html
similarity index 100%
rename from apcd-cms/src/apps/extension/templates/extension_submission_form/extension_err_no_sub_id.html
rename to apcd_cms/src/apps/extension/templates/extension_submission_form/extension_err_no_sub_id.html
diff --git a/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_form_success.html b/apcd_cms/src/apps/extension/templates/extension_submission_form/extension_form_success.html
similarity index 100%
rename from apcd-cms/src/apps/extension/templates/extension_submission_form/extension_form_success.html
rename to apcd_cms/src/apps/extension/templates/extension_submission_form/extension_form_success.html
diff --git a/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_error.html b/apcd_cms/src/apps/extension/templates/extension_submission_form/extension_submission_error.html
similarity index 100%
rename from apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_error.html
rename to apcd_cms/src/apps/extension/templates/extension_submission_form/extension_submission_error.html
diff --git a/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html b/apcd_cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html
similarity index 100%
rename from apcd-cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html
rename to apcd_cms/src/apps/extension/templates/extension_submission_form/extension_submission_form.html
diff --git a/apcd-cms/src/apps/extension/urls.py b/apcd_cms/src/apps/extension/urls.py
similarity index 100%
rename from apcd-cms/src/apps/extension/urls.py
rename to apcd_cms/src/apps/extension/urls.py
diff --git a/apcd-cms/src/apps/extension/views.py b/apcd_cms/src/apps/extension/views.py
similarity index 100%
rename from apcd-cms/src/apps/extension/views.py
rename to apcd_cms/src/apps/extension/views.py
diff --git a/apcd-cms/src/apps/registrations/__init__.py b/apcd_cms/src/apps/registrations/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/registrations/__init__.py
rename to apcd_cms/src/apps/registrations/__init__.py
diff --git a/apcd-cms/src/apps/registrations/apps.py b/apcd_cms/src/apps/registrations/apps.py
similarity index 100%
rename from apcd-cms/src/apps/registrations/apps.py
rename to apcd_cms/src/apps/registrations/apps.py
diff --git a/apcd-cms/src/apps/registrations/static/registrations/css/submission_form.css b/apcd_cms/src/apps/registrations/static/registrations/css/submission_form.css
similarity index 100%
rename from apcd-cms/src/apps/registrations/static/registrations/css/submission_form.css
rename to apcd_cms/src/apps/registrations/static/registrations/css/submission_form.css
diff --git a/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_body.html b/apcd_cms/src/apps/registrations/templates/submission_form/registration_form_body.html
similarity index 100%
rename from apcd-cms/src/apps/registrations/templates/submission_form/registration_form_body.html
rename to apcd_cms/src/apps/registrations/templates/submission_form/registration_form_body.html
diff --git a/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_scripts.html b/apcd_cms/src/apps/registrations/templates/submission_form/registration_form_scripts.html
similarity index 100%
rename from apcd-cms/src/apps/registrations/templates/submission_form/registration_form_scripts.html
rename to apcd_cms/src/apps/registrations/templates/submission_form/registration_form_scripts.html
diff --git a/apcd-cms/src/apps/registrations/templates/submission_form/submission_error.html b/apcd_cms/src/apps/registrations/templates/submission_form/submission_error.html
similarity index 100%
rename from apcd-cms/src/apps/registrations/templates/submission_form/submission_error.html
rename to apcd_cms/src/apps/registrations/templates/submission_form/submission_error.html
diff --git a/apcd-cms/src/apps/registrations/templates/submission_form/submission_form.html b/apcd_cms/src/apps/registrations/templates/submission_form/submission_form.html
similarity index 100%
rename from apcd-cms/src/apps/registrations/templates/submission_form/submission_form.html
rename to apcd_cms/src/apps/registrations/templates/submission_form/submission_form.html
diff --git a/apcd-cms/src/apps/registrations/templates/submission_form/submission_success.html b/apcd_cms/src/apps/registrations/templates/submission_form/submission_success.html
similarity index 100%
rename from apcd-cms/src/apps/registrations/templates/submission_form/submission_success.html
rename to apcd_cms/src/apps/registrations/templates/submission_form/submission_success.html
diff --git a/apcd-cms/src/apps/registrations/urls.py b/apcd_cms/src/apps/registrations/urls.py
similarity index 100%
rename from apcd-cms/src/apps/registrations/urls.py
rename to apcd_cms/src/apps/registrations/urls.py
diff --git a/apcd-cms/src/apps/registrations/views.py b/apcd_cms/src/apps/registrations/views.py
similarity index 100%
rename from apcd-cms/src/apps/registrations/views.py
rename to apcd_cms/src/apps/registrations/views.py
diff --git a/apcd-cms/src/apps/submissions/__init__.py b/apcd_cms/src/apps/submissions/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/submissions/__init__.py
rename to apcd_cms/src/apps/submissions/__init__.py
diff --git a/apcd-cms/src/apps/submissions/apps.py b/apcd_cms/src/apps/submissions/apps.py
similarity index 100%
rename from apcd-cms/src/apps/submissions/apps.py
rename to apcd_cms/src/apps/submissions/apps.py
diff --git a/apcd-cms/src/apps/submissions/static/submissions/css/modal.css b/apcd_cms/src/apps/submissions/static/submissions/css/modal.css
similarity index 100%
rename from apcd-cms/src/apps/submissions/static/submissions/css/modal.css
rename to apcd_cms/src/apps/submissions/static/submissions/css/modal.css
diff --git a/apcd-cms/src/apps/submissions/static/submissions/css/table.css b/apcd_cms/src/apps/submissions/static/submissions/css/table.css
similarity index 100%
rename from apcd-cms/src/apps/submissions/static/submissions/css/table.css
rename to apcd_cms/src/apps/submissions/static/submissions/css/table.css
diff --git a/apcd-cms/src/apps/submissions/templates/list_submissions.html b/apcd_cms/src/apps/submissions/templates/list_submissions.html
similarity index 96%
rename from apcd-cms/src/apps/submissions/templates/list_submissions.html
rename to apcd_cms/src/apps/submissions/templates/list_submissions.html
index 032b127e..09a9dcf8 100644
--- a/apcd-cms/src/apps/submissions/templates/list_submissions.html
+++ b/apcd_cms/src/apps/submissions/templates/list_submissions.html
@@ -3,8 +3,8 @@
 
 {% block content %}
 
-<link rel="stylesheet" href="{% static 'apcd-cms/css/table.css' %}">
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/table.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'submissions/css/table.css' %}">
 <link rel="stylesheet" href="{% static 'submissions/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'admin_regis_table/css/table.css' %}">
diff --git a/apcd-cms/src/apps/submissions/templates/view_submission_logs_modal.html b/apcd_cms/src/apps/submissions/templates/view_submission_logs_modal.html
similarity index 100%
rename from apcd-cms/src/apps/submissions/templates/view_submission_logs_modal.html
rename to apcd_cms/src/apps/submissions/templates/view_submission_logs_modal.html
diff --git a/apcd-cms/src/apps/submissions/urls.py b/apcd_cms/src/apps/submissions/urls.py
similarity index 100%
rename from apcd-cms/src/apps/submissions/urls.py
rename to apcd_cms/src/apps/submissions/urls.py
diff --git a/apcd-cms/src/apps/submissions/views.py b/apcd_cms/src/apps/submissions/views.py
similarity index 100%
rename from apcd-cms/src/apps/submissions/views.py
rename to apcd_cms/src/apps/submissions/views.py
diff --git a/apcd-cms/src/apps/submitter_renewals_listing/__init__.py b/apcd_cms/src/apps/submitter_renewals_listing/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/submitter_renewals_listing/__init__.py
rename to apcd_cms/src/apps/submitter_renewals_listing/__init__.py
diff --git a/apcd-cms/src/apps/submitter_renewals_listing/apps.py b/apcd_cms/src/apps/submitter_renewals_listing/apps.py
similarity index 100%
rename from apcd-cms/src/apps/submitter_renewals_listing/apps.py
rename to apcd_cms/src/apps/submitter_renewals_listing/apps.py
diff --git a/apcd-cms/src/apps/submitter_renewals_listing/static/submitter_renewals_listing/css/table.css b/apcd_cms/src/apps/submitter_renewals_listing/static/submitter_renewals_listing/css/table.css
similarity index 100%
rename from apcd-cms/src/apps/submitter_renewals_listing/static/submitter_renewals_listing/css/table.css
rename to apcd_cms/src/apps/submitter_renewals_listing/static/submitter_renewals_listing/css/table.css
diff --git a/apcd-cms/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html b/apcd_cms/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html
similarity index 97%
rename from apcd-cms/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html
rename to apcd_cms/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html
index 04bd3595..fd486192 100644
--- a/apcd-cms/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html
+++ b/apcd_cms/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html
@@ -3,8 +3,8 @@
 
 {% block content %}
 
-<link rel="stylesheet" href="{% static 'apcd-cms/css/table.css' %}">
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/table.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'admin_regis_table/css/table.css' %}">
 
 <div class="container">
diff --git a/apcd-cms/src/apps/submitter_renewals_listing/templates/submitter_listing_error.html b/apcd_cms/src/apps/submitter_renewals_listing/templates/submitter_listing_error.html
similarity index 100%
rename from apcd-cms/src/apps/submitter_renewals_listing/templates/submitter_listing_error.html
rename to apcd_cms/src/apps/submitter_renewals_listing/templates/submitter_listing_error.html
diff --git a/apcd-cms/src/apps/submitter_renewals_listing/urls.py b/apcd_cms/src/apps/submitter_renewals_listing/urls.py
similarity index 100%
rename from apcd-cms/src/apps/submitter_renewals_listing/urls.py
rename to apcd_cms/src/apps/submitter_renewals_listing/urls.py
diff --git a/apcd-cms/src/apps/submitter_renewals_listing/views.py b/apcd_cms/src/apps/submitter_renewals_listing/views.py
similarity index 100%
rename from apcd-cms/src/apps/submitter_renewals_listing/views.py
rename to apcd_cms/src/apps/submitter_renewals_listing/views.py
diff --git a/apcd-cms/src/apps/utils/__init__.py b/apcd_cms/src/apps/utils/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/utils/__init__.py
rename to apcd_cms/src/apps/utils/__init__.py
diff --git a/apcd-cms/src/apps/utils/apcd_database.py b/apcd_cms/src/apps/utils/apcd_database.py
similarity index 100%
rename from apcd-cms/src/apps/utils/apcd_database.py
rename to apcd_cms/src/apps/utils/apcd_database.py
diff --git a/apcd-cms/src/apps/utils/apcd_groups.py b/apcd_cms/src/apps/utils/apcd_groups.py
similarity index 100%
rename from apcd-cms/src/apps/utils/apcd_groups.py
rename to apcd_cms/src/apps/utils/apcd_groups.py
diff --git a/apcd-cms/src/apps/utils/registrations_data_formatting.py b/apcd_cms/src/apps/utils/registrations_data_formatting.py
similarity index 100%
rename from apcd-cms/src/apps/utils/registrations_data_formatting.py
rename to apcd_cms/src/apps/utils/registrations_data_formatting.py
diff --git a/apcd-cms/src/apps/utils/static/utils/js/checkForBlankInputs.js b/apcd_cms/src/apps/utils/static/utils/js/checkForBlankInputs.js
similarity index 100%
rename from apcd-cms/src/apps/utils/static/utils/js/checkForBlankInputs.js
rename to apcd_cms/src/apps/utils/static/utils/js/checkForBlankInputs.js
diff --git a/apcd-cms/src/apps/utils/utils.py b/apcd_cms/src/apps/utils/utils.py
similarity index 100%
rename from apcd-cms/src/apps/utils/utils.py
rename to apcd_cms/src/apps/utils/utils.py
diff --git a/apcd-cms/src/apps/view_users/__init__.py b/apcd_cms/src/apps/view_users/__init__.py
similarity index 100%
rename from apcd-cms/src/apps/view_users/__init__.py
rename to apcd_cms/src/apps/view_users/__init__.py
diff --git a/apcd-cms/src/apps/view_users/apps.py b/apcd_cms/src/apps/view_users/apps.py
similarity index 100%
rename from apcd-cms/src/apps/view_users/apps.py
rename to apcd_cms/src/apps/view_users/apps.py
diff --git a/apcd-cms/src/apps/view_users/static/view_users_table/css/modal.css b/apcd_cms/src/apps/view_users/static/view_users_table/css/modal.css
similarity index 100%
rename from apcd-cms/src/apps/view_users/static/view_users_table/css/modal.css
rename to apcd_cms/src/apps/view_users/static/view_users_table/css/modal.css
diff --git a/apcd-cms/src/apps/view_users/static/view_users_table/css/table.css b/apcd_cms/src/apps/view_users/static/view_users_table/css/table.css
similarity index 100%
rename from apcd-cms/src/apps/view_users/static/view_users_table/css/table.css
rename to apcd_cms/src/apps/view_users/static/view_users_table/css/table.css
diff --git a/apcd-cms/src/apps/view_users/templates/view_user_edit_error.html b/apcd_cms/src/apps/view_users/templates/view_user_edit_error.html
similarity index 100%
rename from apcd-cms/src/apps/view_users/templates/view_user_edit_error.html
rename to apcd_cms/src/apps/view_users/templates/view_user_edit_error.html
diff --git a/apcd-cms/src/apps/view_users/templates/view_user_edit_modal.html b/apcd_cms/src/apps/view_users/templates/view_user_edit_modal.html
similarity index 98%
rename from apcd-cms/src/apps/view_users/templates/view_user_edit_modal.html
rename to apcd_cms/src/apps/view_users/templates/view_user_edit_modal.html
index 78e2992b..6e04f012 100644
--- a/apcd-cms/src/apps/view_users/templates/view_user_edit_modal.html
+++ b/apcd_cms/src/apps/view_users/templates/view_user_edit_modal.html
@@ -1,5 +1,5 @@
 {% load static %}
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'view_users_table/css/modal.css' %}">
 <div id="editUserModal_{{r.user_id}}" class="modal fade" role="dialog">
   <div class="modal-dialog modal-lg">
diff --git a/apcd-cms/src/apps/view_users/templates/view_user_edit_success.html b/apcd_cms/src/apps/view_users/templates/view_user_edit_success.html
similarity index 100%
rename from apcd-cms/src/apps/view_users/templates/view_user_edit_success.html
rename to apcd_cms/src/apps/view_users/templates/view_user_edit_success.html
diff --git a/apcd-cms/src/apps/view_users/templates/view_user_modal.html b/apcd_cms/src/apps/view_users/templates/view_user_modal.html
similarity index 97%
rename from apcd-cms/src/apps/view_users/templates/view_user_modal.html
rename to apcd_cms/src/apps/view_users/templates/view_user_modal.html
index 6cd5994e..3f47585a 100644
--- a/apcd-cms/src/apps/view_users/templates/view_user_modal.html
+++ b/apcd_cms/src/apps/view_users/templates/view_user_modal.html
@@ -1,5 +1,5 @@
 {% load static %}
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'view_users_table/css/modal.css' %}">
 <div id="viewUserModal_{{r.user_id}}" class="modal fade" role="dialog">
   <div class="modal-dialog modal-lg">
diff --git a/apcd-cms/src/apps/view_users/templates/view_users.html b/apcd_cms/src/apps/view_users/templates/view_users.html
similarity index 97%
rename from apcd-cms/src/apps/view_users/templates/view_users.html
rename to apcd_cms/src/apps/view_users/templates/view_users.html
index bea5bd7f..d5d7633d 100644
--- a/apcd-cms/src/apps/view_users/templates/view_users.html
+++ b/apcd_cms/src/apps/view_users/templates/view_users.html
@@ -3,8 +3,8 @@
 
 {% block content %}
 
-<link rel="stylesheet" href="{% static 'apcd-cms/css/table.css' %}">
-<link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/table.css' %}">
+<link rel="stylesheet" href="{% static 'apcd_cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'view_users_table/css/table.css' %}">
 
 <div class="container">
diff --git a/apcd-cms/src/apps/view_users/urls.py b/apcd_cms/src/apps/view_users/urls.py
similarity index 100%
rename from apcd-cms/src/apps/view_users/urls.py
rename to apcd_cms/src/apps/view_users/urls.py
diff --git a/apcd-cms/src/apps/view_users/views.py b/apcd_cms/src/apps/view_users/views.py
similarity index 100%
rename from apcd-cms/src/apps/view_users/views.py
rename to apcd_cms/src/apps/view_users/views.py
diff --git a/apcd-cms/src/taccsite_cms/custom_app_settings.py b/apcd_cms/src/taccsite_cms/custom_app_settings.py
similarity index 100%
rename from apcd-cms/src/taccsite_cms/custom_app_settings.py
rename to apcd_cms/src/taccsite_cms/custom_app_settings.py
diff --git a/apcd-cms/src/taccsite_cms/templates/guides/getting_started.tam.html b/apcd_cms/src/taccsite_cms/templates/guides/getting_started.tam.html
similarity index 100%
rename from apcd-cms/src/taccsite_cms/templates/guides/getting_started.tam.html
rename to apcd_cms/src/taccsite_cms/templates/guides/getting_started.tam.html
diff --git a/apcd-cms/src/taccsite_cms/templatetags/limit_visibility_in_menu.py b/apcd_cms/src/taccsite_cms/templatetags/limit_visibility_in_menu.py
similarity index 100%
rename from apcd-cms/src/taccsite_cms/templatetags/limit_visibility_in_menu.py
rename to apcd_cms/src/taccsite_cms/templatetags/limit_visibility_in_menu.py
diff --git a/apcd-cms/src/taccsite_cms/urls_custom.py b/apcd_cms/src/taccsite_cms/urls_custom.py
similarity index 100%
rename from apcd-cms/src/taccsite_cms/urls_custom.py
rename to apcd_cms/src/taccsite_cms/urls_custom.py
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/modal--conflicts-with-core.css b/apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/css/modal--conflicts-with-core.css
similarity index 100%
rename from apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/modal--conflicts-with-core.css
rename to apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/css/modal--conflicts-with-core.css
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/modal.css b/apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/css/modal.css
similarity index 100%
rename from apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/modal.css
rename to apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/css/modal.css
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/site.cms.css b/apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/css/site.cms.css
similarity index 100%
rename from apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/site.cms.css
rename to apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/css/site.cms.css
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/table--conflicts-with-core.css b/apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/css/table--conflicts-with-core.css
similarity index 100%
rename from apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/table--conflicts-with-core.css
rename to apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/css/table--conflicts-with-core.css
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/table.css b/apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/css/table.css
similarity index 100%
rename from apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/table.css
rename to apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/css/table.css
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/favicons/favicon.ico b/apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/img/favicons/favicon.ico
similarity index 100%
rename from apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/favicons/favicon.ico
rename to apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/img/favicons/favicon.ico
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/apcd-black.png b/apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/img/org_logos/apcd-black.png
similarity index 100%
rename from apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/apcd-black.png
rename to apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/img/org_logos/apcd-black.png
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/apcd-white.png b/apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/img/org_logos/apcd-white.png
similarity index 100%
rename from apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/apcd-white.png
rename to apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/img/org_logos/apcd-white.png
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/tacc-white.png b/apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/img/org_logos/tacc-white.png
similarity index 100%
rename from apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/tacc-white.png
rename to apcd_cms/src/taccsite_custom/apcd_cms/static/apcd_cms/img/org_logos/tacc-white.png
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html b/apcd_cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html
similarity index 91%
rename from apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html
rename to apcd_cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html
index 830f1b70..2a3cccb8 100644
--- a/apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html
+++ b/apcd_cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html
@@ -20,5 +20,5 @@
 
 <!-- TUP CMS UI Styles -->
 <style>
-  @import url("{% static 'apcd-cms/css/site.cms.css' %}");
+  @import url("{% static 'apcd_cms/css/site.cms.css' %}");
 </style>
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/templates/snippets/tup-175-css-alerts-messages-ui-pattern.html b/apcd_cms/src/taccsite_custom/apcd_cms/templates/snippets/tup-175-css-alerts-messages-ui-pattern.html
similarity index 100%
rename from apcd-cms/src/taccsite_custom/apcd_cms/templates/snippets/tup-175-css-alerts-messages-ui-pattern.html
rename to apcd_cms/src/taccsite_custom/apcd_cms/templates/snippets/tup-175-css-alerts-messages-ui-pattern.html