diff --git a/code/backend/batch/AddURLEmbeddings.py b/code/backend/batch/AddURLEmbeddings.py
index 617c4f082..bc1570956 100644
--- a/code/backend/batch/AddURLEmbeddings.py
+++ b/code/backend/batch/AddURLEmbeddings.py
@@ -5,9 +5,9 @@
 import azure.functions as func
 import requests
 from bs4 import BeautifulSoup
-from utilities.helpers.EnvHelper import EnvHelper
-from utilities.helpers.AzureBlobStorageClient import AzureBlobStorageClient
-from utilities.helpers.embedders.EmbedderFactory import EmbedderFactory
+from utilities.helpers.env_helper import EnvHelper
+from utilities.helpers.azure_blob_storage_client import AzureBlobStorageClient
+from utilities.helpers.embedders.embedder_factory import EmbedderFactory
 
 bp_add_url_embeddings = func.Blueprint()
 logger = logging.getLogger(__name__)
diff --git a/code/backend/batch/BatchPushResults.py b/code/backend/batch/BatchPushResults.py
index de2cbb79d..18859f573 100644
--- a/code/backend/batch/BatchPushResults.py
+++ b/code/backend/batch/BatchPushResults.py
@@ -4,9 +4,9 @@
 import azure.functions as func
 from urllib.parse import urlparse
 
-from utilities.helpers.AzureBlobStorageClient import AzureBlobStorageClient
-from utilities.helpers.EnvHelper import EnvHelper
-from utilities.helpers.embedders.EmbedderFactory import EmbedderFactory
+from utilities.helpers.azure_blob_storage_client import AzureBlobStorageClient
+from utilities.helpers.env_helper import EnvHelper
+from utilities.helpers.embedders.embedder_factory import EmbedderFactory
 
 bp_batch_push_results = func.Blueprint()
 logger = logging.getLogger(__name__)
diff --git a/code/backend/batch/BatchStartProcessing.py b/code/backend/batch/BatchStartProcessing.py
index 79f0aa7dc..8cb72aaca 100644
--- a/code/backend/batch/BatchStartProcessing.py
+++ b/code/backend/batch/BatchStartProcessing.py
@@ -3,7 +3,7 @@
 import json
 import azure.functions as func
 
-from utilities.helpers.AzureBlobStorageClient import (
+from utilities.helpers.azure_blob_storage_client import (
     AzureBlobStorageClient,
     create_queue_client,
 )
diff --git a/code/backend/batch/GetConversationResponse.py b/code/backend/batch/GetConversationResponse.py
index 5d9345074..aa3f74358 100644
--- a/code/backend/batch/GetConversationResponse.py
+++ b/code/backend/batch/GetConversationResponse.py
@@ -3,9 +3,9 @@
 import logging
 import json
 
-from utilities.helpers.EnvHelper import EnvHelper
-from utilities.helpers.OrchestratorHelper import Orchestrator
-from utilities.helpers.config.ConfigHelper import ConfigHelper
+from utilities.helpers.env_helper import EnvHelper
+from utilities.helpers.orchestrator_helper import Orchestrator
+from utilities.helpers.config.config_helper import ConfigHelper
 
 
 bp_get_conversation_response = func.Blueprint()
diff --git a/code/backend/batch/utilities/common/SourceDocument.py b/code/backend/batch/utilities/common/SourceDocument.py
index 94a31319a..8c651c315 100644
--- a/code/backend/batch/utilities/common/SourceDocument.py
+++ b/code/backend/batch/utilities/common/SourceDocument.py
@@ -2,7 +2,7 @@
 import hashlib
 import json
 from urllib.parse import urlparse, quote
-from ..helpers.AzureBlobStorageClient import AzureBlobStorageClient
+from ..helpers.azure_blob_storage_client import AzureBlobStorageClient
 
 
 class SourceDocument:
diff --git a/code/backend/batch/utilities/document_loading/layout.py b/code/backend/batch/utilities/document_loading/layout.py
index 880db813a..752cb7ff4 100644
--- a/code/backend/batch/utilities/document_loading/layout.py
+++ b/code/backend/batch/utilities/document_loading/layout.py
@@ -1,6 +1,6 @@
 from typing import List
 from .document_loading_base import DocumentLoadingBase
-from ..helpers.AzureFormRecognizerHelper import AzureFormRecognizerClient
+from ..helpers.azure_form_recognizer_helper import AzureFormRecognizerClient
 from ..common.SourceDocument import SourceDocument
 
 
diff --git a/code/backend/batch/utilities/document_loading/read.py b/code/backend/batch/utilities/document_loading/read.py
index 60c60998a..6a88d53f8 100644
--- a/code/backend/batch/utilities/document_loading/read.py
+++ b/code/backend/batch/utilities/document_loading/read.py
@@ -1,6 +1,6 @@
 from typing import List
 from .document_loading_base import DocumentLoadingBase
-from ..helpers.AzureFormRecognizerHelper import AzureFormRecognizerClient
+from ..helpers.azure_form_recognizer_helper import AzureFormRecognizerClient
 from ..common.SourceDocument import SourceDocument
 
 
diff --git a/code/backend/batch/utilities/helpers/AzureBlobStorageClient.py b/code/backend/batch/utilities/helpers/azure_blob_storage_client.py
similarity index 99%
rename from code/backend/batch/utilities/helpers/AzureBlobStorageClient.py
rename to code/backend/batch/utilities/helpers/azure_blob_storage_client.py
index ea1fb4dce..2088ed550 100644
--- a/code/backend/batch/utilities/helpers/AzureBlobStorageClient.py
+++ b/code/backend/batch/utilities/helpers/azure_blob_storage_client.py
@@ -10,7 +10,7 @@
 )
 from azure.storage.queue import QueueClient, BinaryBase64EncodePolicy
 import chardet
-from .EnvHelper import EnvHelper
+from .env_helper import EnvHelper
 from azure.identity import DefaultAzureCredential
 
 
diff --git a/code/backend/batch/utilities/helpers/AzureFormRecognizerHelper.py b/code/backend/batch/utilities/helpers/azure_form_recognizer_helper.py
similarity index 99%
rename from code/backend/batch/utilities/helpers/AzureFormRecognizerHelper.py
rename to code/backend/batch/utilities/helpers/azure_form_recognizer_helper.py
index 162cbeb9b..22e0fa576 100644
--- a/code/backend/batch/utilities/helpers/AzureFormRecognizerHelper.py
+++ b/code/backend/batch/utilities/helpers/azure_form_recognizer_helper.py
@@ -3,7 +3,7 @@
 from azure.identity import DefaultAzureCredential
 import html
 import traceback
-from .EnvHelper import EnvHelper
+from .env_helper import EnvHelper
 
 
 class AzureFormRecognizerClient:
diff --git a/code/backend/batch/utilities/helpers/AzureSearchHelper.py b/code/backend/batch/utilities/helpers/azure_search_helper.py
similarity index 99%
rename from code/backend/batch/utilities/helpers/AzureSearchHelper.py
rename to code/backend/batch/utilities/helpers/azure_search_helper.py
index bddebf548..929e4e03e 100644
--- a/code/backend/batch/utilities/helpers/AzureSearchHelper.py
+++ b/code/backend/batch/utilities/helpers/azure_search_helper.py
@@ -24,8 +24,8 @@
     VectorSearchAlgorithmMetric,
     VectorSearchProfile,
 )
-from .LLMHelper import LLMHelper
-from .EnvHelper import EnvHelper
+from .llm_helper import LLMHelper
+from .env_helper import EnvHelper
 
 logger = logging.getLogger(__name__)
 
diff --git a/code/backend/batch/utilities/helpers/config/ConfigHelper.py b/code/backend/batch/utilities/helpers/config/config_helper.py
similarity index 98%
rename from code/backend/batch/utilities/helpers/config/ConfigHelper.py
rename to code/backend/batch/utilities/helpers/config/config_helper.py
index eac645dc6..ade1e808a 100644
--- a/code/backend/batch/utilities/helpers/config/ConfigHelper.py
+++ b/code/backend/batch/utilities/helpers/config/config_helper.py
@@ -3,13 +3,13 @@
 import logging
 from string import Template
 
-from ..AzureBlobStorageClient import AzureBlobStorageClient
+from ..azure_blob_storage_client import AzureBlobStorageClient
 from ...document_chunking.chunking_strategy import ChunkingStrategy, ChunkingSettings
 from ...document_loading import LoadingSettings, LoadingStrategy
-from .EmbeddingConfig import EmbeddingConfig
+from .embedding_config import EmbeddingConfig
 from ...orchestrator.OrchestrationStrategy import OrchestrationStrategy
 from ...orchestrator import OrchestrationSettings
-from ..EnvHelper import EnvHelper
+from ..env_helper import EnvHelper
 
 CONFIG_CONTAINER_NAME = "config"
 CONFIG_FILE_NAME = "active.json"
diff --git a/code/backend/batch/utilities/helpers/config/EmbeddingConfig.py b/code/backend/batch/utilities/helpers/config/embedding_config.py
similarity index 88%
rename from code/backend/batch/utilities/helpers/config/EmbeddingConfig.py
rename to code/backend/batch/utilities/helpers/config/embedding_config.py
index ce75bfdde..815abe0ab 100644
--- a/code/backend/batch/utilities/helpers/config/EmbeddingConfig.py
+++ b/code/backend/batch/utilities/helpers/config/embedding_config.py
@@ -1,5 +1,5 @@
-from ..DocumentLoadingHelper import LoadingSettings
-from ..DocumentChunkingHelper import ChunkingSettings
+from ..document_loading_helper import LoadingSettings
+from ..document_chunking_helper import ChunkingSettings
 
 
 class EmbeddingConfig(ChunkingSettings, LoadingSettings):
diff --git a/code/backend/batch/utilities/helpers/DocumentChunkingHelper.py b/code/backend/batch/utilities/helpers/document_chunking_helper.py
similarity index 100%
rename from code/backend/batch/utilities/helpers/DocumentChunkingHelper.py
rename to code/backend/batch/utilities/helpers/document_chunking_helper.py
diff --git a/code/backend/batch/utilities/helpers/DocumentLoadingHelper.py b/code/backend/batch/utilities/helpers/document_loading_helper.py
similarity index 100%
rename from code/backend/batch/utilities/helpers/DocumentLoadingHelper.py
rename to code/backend/batch/utilities/helpers/document_loading_helper.py
diff --git a/code/backend/batch/utilities/helpers/embedders/EmbedderBase.py b/code/backend/batch/utilities/helpers/embedders/embedder_base.py
similarity index 100%
rename from code/backend/batch/utilities/helpers/embedders/EmbedderBase.py
rename to code/backend/batch/utilities/helpers/embedders/embedder_base.py
diff --git a/code/backend/batch/utilities/helpers/embedders/EmbedderFactory.py b/code/backend/batch/utilities/helpers/embedders/embedder_factory.py
similarity index 63%
rename from code/backend/batch/utilities/helpers/embedders/EmbedderFactory.py
rename to code/backend/batch/utilities/helpers/embedders/embedder_factory.py
index 61a5a34aa..354c698f6 100644
--- a/code/backend/batch/utilities/helpers/embedders/EmbedderFactory.py
+++ b/code/backend/batch/utilities/helpers/embedders/embedder_factory.py
@@ -1,7 +1,7 @@
-from ..EnvHelper import EnvHelper
-from ..AzureBlobStorageClient import AzureBlobStorageClient
-from .PushEmbedder import PushEmbedder
-from .IntegratedVectorizationEmbedder import (
+from ..env_helper import EnvHelper
+from ..azure_blob_storage_client import AzureBlobStorageClient
+from .push_embedder import PushEmbedder
+from .integrated_vectorization_embedder import (
     IntegratedVectorizationEmbedder,
 )
 
diff --git a/code/backend/batch/utilities/helpers/embedders/IntegratedVectorizationEmbedder.py b/code/backend/batch/utilities/helpers/embedders/integrated_vectorization_embedder.py
similarity index 91%
rename from code/backend/batch/utilities/helpers/embedders/IntegratedVectorizationEmbedder.py
rename to code/backend/batch/utilities/helpers/embedders/integrated_vectorization_embedder.py
index 0f97a0f12..b92cf8375 100644
--- a/code/backend/batch/utilities/helpers/embedders/IntegratedVectorizationEmbedder.py
+++ b/code/backend/batch/utilities/helpers/embedders/integrated_vectorization_embedder.py
@@ -1,11 +1,11 @@
-from .EmbedderBase import EmbedderBase
-from ..EnvHelper import EnvHelper
-from ..LLMHelper import LLMHelper
+from .embedder_base import EmbedderBase
+from ..env_helper import EnvHelper
+from ..llm_helper import LLMHelper
 from ...integrated_vectorization.AzureSearchIndex import AzureSearchIndex
 from ...integrated_vectorization.AzureSearchIndexer import AzureSearchIndexer
 from ...integrated_vectorization.AzureSearchDatasource import AzureSearchDatasource
 from ...integrated_vectorization.AzureSearchSkillset import AzureSearchSkillset
-from ..config.ConfigHelper import ConfigHelper
+from ..config.config_helper import ConfigHelper
 import logging
 
 logger = logging.getLogger(__name__)
diff --git a/code/backend/batch/utilities/helpers/embedders/PushEmbedder.py b/code/backend/batch/utilities/helpers/embedders/push_embedder.py
similarity index 87%
rename from code/backend/batch/utilities/helpers/embedders/PushEmbedder.py
rename to code/backend/batch/utilities/helpers/embedders/push_embedder.py
index 730bc8b0d..342a5633b 100644
--- a/code/backend/batch/utilities/helpers/embedders/PushEmbedder.py
+++ b/code/backend/batch/utilities/helpers/embedders/push_embedder.py
@@ -2,17 +2,17 @@
 import logging
 from typing import List
 
-from ...helpers.LLMHelper import LLMHelper
+from ...helpers.llm_helper import LLMHelper
 
-from ..AzureBlobStorageClient import AzureBlobStorageClient
+from ..azure_blob_storage_client import AzureBlobStorageClient
 
-from ..config.EmbeddingConfig import EmbeddingConfig
-from ..config.ConfigHelper import ConfigHelper
+from ..config.embedding_config import EmbeddingConfig
+from ..config.config_helper import ConfigHelper
 
-from .EmbedderBase import EmbedderBase
-from ..AzureSearchHelper import AzureSearchHelper
-from ..DocumentLoadingHelper import DocumentLoading
-from ..DocumentChunkingHelper import DocumentChunking
+from .embedder_base import EmbedderBase
+from ..azure_search_helper import AzureSearchHelper
+from ..document_loading_helper import DocumentLoading
+from ..document_chunking_helper import DocumentChunking
 from ...common.SourceDocument import SourceDocument
 
 logger = logging.getLogger(__name__)
diff --git a/code/backend/batch/utilities/helpers/EnvHelper.py b/code/backend/batch/utilities/helpers/env_helper.py
similarity index 100%
rename from code/backend/batch/utilities/helpers/EnvHelper.py
rename to code/backend/batch/utilities/helpers/env_helper.py
diff --git a/code/backend/batch/utilities/helpers/LLMHelper.py b/code/backend/batch/utilities/helpers/llm_helper.py
similarity index 99%
rename from code/backend/batch/utilities/helpers/LLMHelper.py
rename to code/backend/batch/utilities/helpers/llm_helper.py
index e2133bcf5..8c6084033 100644
--- a/code/backend/batch/utilities/helpers/LLMHelper.py
+++ b/code/backend/batch/utilities/helpers/llm_helper.py
@@ -6,7 +6,7 @@
 from semantic_kernel.connectors.ai.open_ai.prompt_execution_settings.azure_chat_prompt_execution_settings import (
     AzureChatPromptExecutionSettings,
 )
-from .EnvHelper import EnvHelper
+from .env_helper import EnvHelper
 
 
 class LLMHelper:
diff --git a/code/backend/batch/utilities/helpers/OrchestratorHelper.py b/code/backend/batch/utilities/helpers/orchestrator_helper.py
similarity index 100%
rename from code/backend/batch/utilities/helpers/OrchestratorHelper.py
rename to code/backend/batch/utilities/helpers/orchestrator_helper.py
diff --git a/code/backend/batch/utilities/integrated_vectorization/AzureSearchDatasource.py b/code/backend/batch/utilities/integrated_vectorization/AzureSearchDatasource.py
index b1ef723dd..60ab35729 100644
--- a/code/backend/batch/utilities/integrated_vectorization/AzureSearchDatasource.py
+++ b/code/backend/batch/utilities/integrated_vectorization/AzureSearchDatasource.py
@@ -6,7 +6,7 @@
     NativeBlobSoftDeleteDeletionDetectionPolicy,
 )
 from azure.search.documents.indexes import SearchIndexerClient
-from ..helpers.EnvHelper import EnvHelper
+from ..helpers.env_helper import EnvHelper
 from azure.identity import DefaultAzureCredential
 from azure.core.credentials import AzureKeyCredential
 
diff --git a/code/backend/batch/utilities/integrated_vectorization/AzureSearchIndex.py b/code/backend/batch/utilities/integrated_vectorization/AzureSearchIndex.py
index d09311854..413082460 100644
--- a/code/backend/batch/utilities/integrated_vectorization/AzureSearchIndex.py
+++ b/code/backend/batch/utilities/integrated_vectorization/AzureSearchIndex.py
@@ -20,10 +20,10 @@
     SemanticField,
     SearchIndex,
 )
-from ..helpers.EnvHelper import EnvHelper
+from ..helpers.env_helper import EnvHelper
 from azure.identity import DefaultAzureCredential
 from azure.core.credentials import AzureKeyCredential
-from ..helpers.LLMHelper import LLMHelper
+from ..helpers.llm_helper import LLMHelper
 
 logger = logging.getLogger(__name__)
 
diff --git a/code/backend/batch/utilities/integrated_vectorization/AzureSearchIndexer.py b/code/backend/batch/utilities/integrated_vectorization/AzureSearchIndexer.py
index 66751bf2b..f2bf5ca07 100644
--- a/code/backend/batch/utilities/integrated_vectorization/AzureSearchIndexer.py
+++ b/code/backend/batch/utilities/integrated_vectorization/AzureSearchIndexer.py
@@ -1,7 +1,7 @@
 import logging
 from azure.search.documents.indexes.models import SearchIndexer, FieldMapping
 from azure.search.documents.indexes import SearchIndexerClient
-from ..helpers.EnvHelper import EnvHelper
+from ..helpers.env_helper import EnvHelper
 from azure.identity import DefaultAzureCredential
 from azure.core.credentials import AzureKeyCredential
 
diff --git a/code/backend/batch/utilities/integrated_vectorization/AzureSearchSkillset.py b/code/backend/batch/utilities/integrated_vectorization/AzureSearchSkillset.py
index 8c74c6f2e..f80b3e6d1 100644
--- a/code/backend/batch/utilities/integrated_vectorization/AzureSearchSkillset.py
+++ b/code/backend/batch/utilities/integrated_vectorization/AzureSearchSkillset.py
@@ -11,8 +11,8 @@
     SearchIndexerSkillset,
 )
 from azure.search.documents.indexes import SearchIndexerClient
-from ..helpers.config.ConfigHelper import IntegratedVectorizationConfig
-from ..helpers.EnvHelper import EnvHelper
+from ..helpers.config.config_helper import IntegratedVectorizationConfig
+from ..helpers.env_helper import EnvHelper
 from azure.identity import DefaultAzureCredential
 from azure.core.credentials import AzureKeyCredential
 
diff --git a/code/backend/batch/utilities/loggers/ConversationLogger.py b/code/backend/batch/utilities/loggers/ConversationLogger.py
index 6a54f8321..84f187ad0 100644
--- a/code/backend/batch/utilities/loggers/ConversationLogger.py
+++ b/code/backend/batch/utilities/loggers/ConversationLogger.py
@@ -1,4 +1,4 @@
-from ..helpers.AzureSearchHelper import AzureSearchHelper
+from ..helpers.azure_search_helper import AzureSearchHelper
 from datetime import datetime
 import json
 
diff --git a/code/backend/batch/utilities/orchestrator/LangChainAgent.py b/code/backend/batch/utilities/orchestrator/LangChainAgent.py
index 4e46f5387..e601b7a5a 100644
--- a/code/backend/batch/utilities/orchestrator/LangChainAgent.py
+++ b/code/backend/batch/utilities/orchestrator/LangChainAgent.py
@@ -7,7 +7,7 @@
 from langchain_community.callbacks import get_openai_callback
 
 from .OrchestratorBase import OrchestratorBase
-from ..helpers.LLMHelper import LLMHelper
+from ..helpers.llm_helper import LLMHelper
 from ..tools.PostPromptTool import PostPromptTool
 from ..tools.QuestionAnswerTool import QuestionAnswerTool
 from ..tools.TextProcessingTool import TextProcessingTool
diff --git a/code/backend/batch/utilities/orchestrator/OpenAIFunctions.py b/code/backend/batch/utilities/orchestrator/OpenAIFunctions.py
index 6521f4abe..6e890a188 100644
--- a/code/backend/batch/utilities/orchestrator/OpenAIFunctions.py
+++ b/code/backend/batch/utilities/orchestrator/OpenAIFunctions.py
@@ -3,7 +3,7 @@
 import json
 
 from .OrchestratorBase import OrchestratorBase
-from ..helpers.LLMHelper import LLMHelper
+from ..helpers.llm_helper import LLMHelper
 from ..tools.PostPromptTool import PostPromptTool
 from ..tools.QuestionAnswerTool import QuestionAnswerTool
 from ..tools.TextProcessingTool import TextProcessingTool
diff --git a/code/backend/batch/utilities/orchestrator/OrchestratorBase.py b/code/backend/batch/utilities/orchestrator/OrchestratorBase.py
index be418b69c..7f243210c 100644
--- a/code/backend/batch/utilities/orchestrator/OrchestratorBase.py
+++ b/code/backend/batch/utilities/orchestrator/OrchestratorBase.py
@@ -3,7 +3,7 @@
 from typing import List, Optional
 from abc import ABC, abstractmethod
 from ..loggers.ConversationLogger import ConversationLogger
-from ..helpers.config.ConfigHelper import ConfigHelper
+from ..helpers.config.config_helper import ConfigHelper
 from ..parser.OutputParserTool import OutputParserTool
 from ..tools.ContentSafetyChecker import ContentSafetyChecker
 
diff --git a/code/backend/batch/utilities/orchestrator/SemanticKernel.py b/code/backend/batch/utilities/orchestrator/SemanticKernel.py
index fdbbaac5c..7d9cfd3cc 100644
--- a/code/backend/batch/utilities/orchestrator/SemanticKernel.py
+++ b/code/backend/batch/utilities/orchestrator/SemanticKernel.py
@@ -8,7 +8,7 @@
 from semantic_kernel.contents.chat_message_content import ChatMessageContent
 
 from ..common.Answer import Answer
-from ..helpers.LLMHelper import LLMHelper
+from ..helpers.llm_helper import LLMHelper
 from ..plugins.ChatPlugin import ChatPlugin
 from ..plugins.PostAnsweringPlugin import PostAnsweringPlugin
 from .OrchestratorBase import OrchestratorBase
diff --git a/code/backend/batch/utilities/search/AzureSearchHandler.py b/code/backend/batch/utilities/search/AzureSearchHandler.py
index a814b0000..6b72544b9 100644
--- a/code/backend/batch/utilities/search/AzureSearchHandler.py
+++ b/code/backend/batch/utilities/search/AzureSearchHandler.py
@@ -1,7 +1,7 @@
 from typing import List
 from .SearchHandlerBase import SearchHandlerBase
-from ..helpers.LLMHelper import LLMHelper
-from ..helpers.AzureSearchHelper import AzureSearchHelper
+from ..helpers.llm_helper import LLMHelper
+from ..helpers.azure_search_helper import AzureSearchHelper
 from ..common.SourceDocument import SourceDocument
 import json
 from azure.search.documents.models import VectorizedQuery
diff --git a/code/backend/batch/utilities/search/Search.py b/code/backend/batch/utilities/search/Search.py
index 836bf146b..6d16f3935 100644
--- a/code/backend/batch/utilities/search/Search.py
+++ b/code/backend/batch/utilities/search/Search.py
@@ -3,7 +3,7 @@
     IntegratedVectorizationSearchHandler,
 )
 from ..common.SourceDocument import SourceDocument
-from ..helpers.EnvHelper import EnvHelper
+from ..helpers.env_helper import EnvHelper
 
 
 class Search:
diff --git a/code/backend/batch/utilities/search/SearchHandlerBase.py b/code/backend/batch/utilities/search/SearchHandlerBase.py
index 5522149ec..b1dba8e96 100644
--- a/code/backend/batch/utilities/search/SearchHandlerBase.py
+++ b/code/backend/batch/utilities/search/SearchHandlerBase.py
@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from ..helpers.EnvHelper import EnvHelper
+from ..helpers.env_helper import EnvHelper
 
 from ..common.SourceDocument import SourceDocument
 
diff --git a/code/backend/batch/utilities/tools/ContentSafetyChecker.py b/code/backend/batch/utilities/tools/ContentSafetyChecker.py
index 8459f5bc1..681531975 100644
--- a/code/backend/batch/utilities/tools/ContentSafetyChecker.py
+++ b/code/backend/batch/utilities/tools/ContentSafetyChecker.py
@@ -4,7 +4,7 @@
 from azure.identity import DefaultAzureCredential
 from azure.core.exceptions import HttpResponseError
 from azure.ai.contentsafety.models import AnalyzeTextOptions
-from ..helpers.EnvHelper import EnvHelper
+from ..helpers.env_helper import EnvHelper
 from .AnswerProcessingBase import AnswerProcessingBase
 from ..common.Answer import Answer
 
diff --git a/code/backend/batch/utilities/tools/PostPromptTool.py b/code/backend/batch/utilities/tools/PostPromptTool.py
index 3baeaba23..ef13985d0 100644
--- a/code/backend/batch/utilities/tools/PostPromptTool.py
+++ b/code/backend/batch/utilities/tools/PostPromptTool.py
@@ -2,8 +2,8 @@
 from langchain.prompts import PromptTemplate
 from langchain_community.callbacks import get_openai_callback
 from ..common.Answer import Answer
-from ..helpers.LLMHelper import LLMHelper
-from ..helpers.config.ConfigHelper import ConfigHelper
+from ..helpers.llm_helper import LLMHelper
+from ..helpers.config.config_helper import ConfigHelper
 
 
 class PostPromptTool:
diff --git a/code/backend/batch/utilities/tools/QuestionAnswerTool.py b/code/backend/batch/utilities/tools/QuestionAnswerTool.py
index 58c62c767..37fef75c4 100644
--- a/code/backend/batch/utilities/tools/QuestionAnswerTool.py
+++ b/code/backend/batch/utilities/tools/QuestionAnswerTool.py
@@ -18,9 +18,9 @@
 from langchain_community.callbacks import get_openai_callback
 from langchain_core.messages import SystemMessage
 
-from ..helpers.config.ConfigHelper import ConfigHelper
-from ..helpers.LLMHelper import LLMHelper
-from ..helpers.EnvHelper import EnvHelper
+from ..helpers.config.config_helper import ConfigHelper
+from ..helpers.llm_helper import LLMHelper
+from ..helpers.env_helper import EnvHelper
 from ..common.Answer import Answer
 
 logger = logging.getLogger(__name__)
diff --git a/code/backend/batch/utilities/tools/TextProcessingTool.py b/code/backend/batch/utilities/tools/TextProcessingTool.py
index f8c05c4d4..1a0c0e33e 100644
--- a/code/backend/batch/utilities/tools/TextProcessingTool.py
+++ b/code/backend/batch/utilities/tools/TextProcessingTool.py
@@ -1,5 +1,5 @@
 from typing import List
-from ..helpers.LLMHelper import LLMHelper
+from ..helpers.llm_helper import LLMHelper
 from .AnsweringToolBase import AnsweringToolBase
 from ..common.Answer import Answer
 
diff --git a/code/backend/pages/01_Ingest_Data.py b/code/backend/pages/01_Ingest_Data.py
index 5851b3363..4f96e74a8 100644
--- a/code/backend/pages/01_Ingest_Data.py
+++ b/code/backend/pages/01_Ingest_Data.py
@@ -5,9 +5,9 @@
 import urllib.parse
 import sys
 import logging
-from batch.utilities.helpers.config.ConfigHelper import ConfigHelper
-from batch.utilities.helpers.EnvHelper import EnvHelper
-from batch.utilities.helpers.AzureBlobStorageClient import AzureBlobStorageClient
+from batch.utilities.helpers.config.config_helper import ConfigHelper
+from batch.utilities.helpers.env_helper import EnvHelper
+from batch.utilities.helpers.azure_blob_storage_client import AzureBlobStorageClient
 
 sys.path.append(path.join(path.dirname(__file__), ".."))
 env_helper: EnvHelper = EnvHelper()
diff --git a/code/backend/pages/02_Explore_Data.py b/code/backend/pages/02_Explore_Data.py
index a396708f9..593a2b476 100644
--- a/code/backend/pages/02_Explore_Data.py
+++ b/code/backend/pages/02_Explore_Data.py
@@ -3,7 +3,7 @@
 import traceback
 import sys
 import pandas as pd
-from batch.utilities.helpers.EnvHelper import EnvHelper
+from batch.utilities.helpers.env_helper import EnvHelper
 from batch.utilities.search.Search import Search
 
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
diff --git a/code/backend/pages/03_Delete_Data.py b/code/backend/pages/03_Delete_Data.py
index 0f2bd2039..f93a92aed 100644
--- a/code/backend/pages/03_Delete_Data.py
+++ b/code/backend/pages/03_Delete_Data.py
@@ -3,7 +3,7 @@
 import traceback
 import sys
 import logging
-from batch.utilities.helpers.EnvHelper import EnvHelper
+from batch.utilities.helpers.env_helper import EnvHelper
 from batch.utilities.search.Search import Search
 
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
diff --git a/code/backend/pages/04_Configuration.py b/code/backend/pages/04_Configuration.py
index c58844e8a..dd76f8c8d 100644
--- a/code/backend/pages/04_Configuration.py
+++ b/code/backend/pages/04_Configuration.py
@@ -4,8 +4,8 @@
 import os
 import traceback
 import sys
-from batch.utilities.helpers.EnvHelper import EnvHelper
-from batch.utilities.helpers.config.ConfigHelper import ConfigHelper
+from batch.utilities.helpers.env_helper import EnvHelper
+from batch.utilities.helpers.config.config_helper import ConfigHelper
 from azure.core.exceptions import ResourceNotFoundError
 
 sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
diff --git a/code/create_app.py b/code/create_app.py
index 9716f8bf2..3cad8396d 100644
--- a/code/create_app.py
+++ b/code/create_app.py
@@ -9,9 +9,9 @@
 from dotenv import load_dotenv
 import sys
 import functools
-from backend.batch.utilities.helpers.EnvHelper import EnvHelper
-from backend.batch.utilities.helpers.OrchestratorHelper import Orchestrator
-from backend.batch.utilities.helpers.config.ConfigHelper import ConfigHelper
+from backend.batch.utilities.helpers.env_helper import EnvHelper
+from backend.batch.utilities.helpers.orchestrator_helper import Orchestrator
+from backend.batch.utilities.helpers.config.config_helper import ConfigHelper
 from azure.mgmt.cognitiveservices import CognitiveServicesManagementClient
 from azure.identity import DefaultAzureCredential
 
diff --git a/code/tests/functional/backend_api/tests/default/conftest.py b/code/tests/functional/backend_api/tests/default/conftest.py
index fcf9284e2..99a0e6c71 100644
--- a/code/tests/functional/backend_api/tests/default/conftest.py
+++ b/code/tests/functional/backend_api/tests/default/conftest.py
@@ -2,8 +2,8 @@
 import pytest
 from tests.functional.backend_api.app_config import AppConfig
 from tests.functional.backend_api.common import get_free_port, start_app
-from backend.batch.utilities.helpers.config.ConfigHelper import ConfigHelper
-from backend.batch.utilities.helpers.EnvHelper import EnvHelper
+from backend.batch.utilities.helpers.config.config_helper import ConfigHelper
+from backend.batch.utilities.helpers.env_helper import EnvHelper
 
 logger = logging.getLogger(__name__)
 
diff --git a/code/tests/functional/backend_api/tests/sk_orchestrator/conftest.py b/code/tests/functional/backend_api/tests/sk_orchestrator/conftest.py
index 4bf343e18..040e6702b 100644
--- a/code/tests/functional/backend_api/tests/sk_orchestrator/conftest.py
+++ b/code/tests/functional/backend_api/tests/sk_orchestrator/conftest.py
@@ -2,8 +2,8 @@
 import pytest
 from tests.functional.backend_api.app_config import AppConfig
 from tests.functional.backend_api.common import get_free_port, start_app
-from backend.batch.utilities.helpers.config.ConfigHelper import ConfigHelper
-from backend.batch.utilities.helpers.EnvHelper import EnvHelper
+from backend.batch.utilities.helpers.config.config_helper import ConfigHelper
+from backend.batch.utilities.helpers.env_helper import EnvHelper
 
 logger = logging.getLogger(__name__)
 
diff --git a/code/tests/functional/backend_api/tests/without_data/conftest.py b/code/tests/functional/backend_api/tests/without_data/conftest.py
index e7e4dbb16..ddefaab19 100644
--- a/code/tests/functional/backend_api/tests/without_data/conftest.py
+++ b/code/tests/functional/backend_api/tests/without_data/conftest.py
@@ -2,8 +2,8 @@
 import pytest
 from tests.functional.backend_api.app_config import AppConfig
 from tests.functional.backend_api.common import get_free_port, start_app
-from backend.batch.utilities.helpers.config.ConfigHelper import ConfigHelper
-from backend.batch.utilities.helpers.EnvHelper import EnvHelper
+from backend.batch.utilities.helpers.config.config_helper import ConfigHelper
+from backend.batch.utilities.helpers.env_helper import EnvHelper
 
 logger = logging.getLogger(__name__)
 
diff --git a/code/tests/test_AzureBlobStorage.py b/code/tests/test_AzureBlobStorage.py
index dfa81a978..91aedf94c 100644
--- a/code/tests/test_AzureBlobStorage.py
+++ b/code/tests/test_AzureBlobStorage.py
@@ -1,5 +1,5 @@
 import pytest
-from backend.batch.utilities.helpers.AzureBlobStorageClient import (
+from backend.batch.utilities.helpers.azure_blob_storage_client import (
     AzureBlobStorageClient,
 )
 
diff --git a/code/tests/test_DocumentProcessor.py b/code/tests/test_DocumentProcessor.py
index 4003c4dff..eaf47a7e5 100644
--- a/code/tests/test_DocumentProcessor.py
+++ b/code/tests/test_DocumentProcessor.py
@@ -1,9 +1,9 @@
 import pytest
-from backend.batch.utilities.helpers.embedders.PushEmbedder import (
+from backend.batch.utilities.helpers.embedders.push_embedder import (
     PushEmbedder,
 )
-from backend.batch.utilities.helpers.config.ConfigHelper import ConfigHelper
-from backend.batch.utilities.helpers.AzureBlobStorageClient import (
+from backend.batch.utilities.helpers.config.config_helper import ConfigHelper
+from backend.batch.utilities.helpers.azure_blob_storage_client import (
     AzureBlobStorageClient,
 )
 
diff --git a/code/tests/test_app.py b/code/tests/test_app.py
index 402801e1a..5bd8ed8ba 100644
--- a/code/tests/test_app.py
+++ b/code/tests/test_app.py
@@ -205,7 +205,7 @@ def setup_method(self):
 
     @patch("create_app.get_message_orchestrator")
     @patch(
-        "backend.batch.utilities.helpers.config.ConfigHelper.ConfigHelper.get_active_config_or_default"
+        "backend.batch.utilities.helpers.config.config_helper.ConfigHelper.get_active_config_or_default"
     )
     def test_converstation_custom_returns_correct_response(
         self,
diff --git a/code/tests/utilities/helpers/processors/test_IntegratedVectorizationEmbedder.py b/code/tests/utilities/helpers/processors/test_IntegratedVectorizationEmbedder.py
index a573a4070..6e55ea6c1 100644
--- a/code/tests/utilities/helpers/processors/test_IntegratedVectorizationEmbedder.py
+++ b/code/tests/utilities/helpers/processors/test_IntegratedVectorizationEmbedder.py
@@ -1,6 +1,6 @@
 import pytest
 from unittest.mock import MagicMock, patch
-from backend.batch.utilities.helpers.embedders.IntegratedVectorizationEmbedder import (
+from backend.batch.utilities.helpers.embedders.integrated_vectorization_embedder import (
     IntegratedVectorizationEmbedder,
 )
 from backend.batch.utilities.document_chunking.chunking_strategy import ChunkingSettings
@@ -15,7 +15,7 @@
 @pytest.fixture(autouse=True)
 def env_helper_mock():
     with patch(
-        "backend.batch.utilities.helpers.embedders.IntegratedVectorizationEmbedder.EnvHelper"
+        "backend.batch.utilities.helpers.embedders.integrated_vectorization_embedder.EnvHelper"
     ) as mock:
         env_helper = mock.return_value
         env_helper.AZURE_SEARCH_INDEXER_NAME = AZURE_SEARCH_INDEXER_NAME
@@ -26,7 +26,7 @@ def env_helper_mock():
 @pytest.fixture(autouse=True)
 def llm_helper_mock():
     with patch(
-        "backend.batch.utilities.helpers.embedders.IntegratedVectorizationEmbedder.LLMHelper"
+        "backend.batch.utilities.helpers.embedders.integrated_vectorization_embedder.LLMHelper"
     ) as mock:
         llm_helper = mock.return_value
         llm_helper.get_embedding_model.return_value.embed_query.return_value = [
@@ -39,7 +39,7 @@ def llm_helper_mock():
 @pytest.fixture(autouse=True)
 def azure_search_iv_index_helper_mock():
     with patch(
-        "backend.batch.utilities.helpers.embedders.IntegratedVectorizationEmbedder.AzureSearchIndex"
+        "backend.batch.utilities.helpers.embedders.integrated_vectorization_embedder.AzureSearchIndex"
     ) as mock:
         yield mock
 
@@ -47,7 +47,7 @@ def azure_search_iv_index_helper_mock():
 @pytest.fixture(autouse=True)
 def azure_search_iv_datasource_helper_mock():
     with patch(
-        "backend.batch.utilities.helpers.embedders.IntegratedVectorizationEmbedder.AzureSearchDatasource"
+        "backend.batch.utilities.helpers.embedders.integrated_vectorization_embedder.AzureSearchDatasource"
     ) as mock:
         yield mock
 
@@ -55,7 +55,7 @@ def azure_search_iv_datasource_helper_mock():
 @pytest.fixture(autouse=True)
 def azure_search_iv_skillset_helper_mock():
     with patch(
-        "backend.batch.utilities.helpers.embedders.IntegratedVectorizationEmbedder.AzureSearchSkillset"
+        "backend.batch.utilities.helpers.embedders.integrated_vectorization_embedder.AzureSearchSkillset"
     ) as mock:
         yield mock
 
@@ -63,7 +63,7 @@ def azure_search_iv_skillset_helper_mock():
 @pytest.fixture(autouse=True)
 def azure_search_iv_indexer_helper_mock():
     with patch(
-        "backend.batch.utilities.helpers.embedders.IntegratedVectorizationEmbedder.AzureSearchIndexer"
+        "backend.batch.utilities.helpers.embedders.integrated_vectorization_embedder.AzureSearchIndexer"
     ) as mock:
         yield mock
 
@@ -71,7 +71,7 @@ def azure_search_iv_indexer_helper_mock():
 @pytest.fixture(autouse=True)
 def mock_config_helper():
     with patch(
-        "backend.batch.utilities.helpers.embedders.IntegratedVectorizationEmbedder.ConfigHelper"
+        "backend.batch.utilities.helpers.embedders.integrated_vectorization_embedder.ConfigHelper"
     ) as mock:
         config_helper = mock.get_active_config_or_default
         iv_config = config_helper.return_value.integrated_vectorization_config
diff --git a/code/tests/utilities/helpers/test_AzureSearchHelper.py b/code/tests/utilities/helpers/test_AzureSearchHelper.py
index 6c0b3b4a1..27072fc19 100644
--- a/code/tests/utilities/helpers/test_AzureSearchHelper.py
+++ b/code/tests/utilities/helpers/test_AzureSearchHelper.py
@@ -1,6 +1,6 @@
 import pytest
 from unittest.mock import ANY, MagicMock, patch
-from backend.batch.utilities.helpers.AzureSearchHelper import AzureSearchHelper
+from backend.batch.utilities.helpers.azure_search_helper import AzureSearchHelper
 from azure.search.documents.indexes.models import (
     ExhaustiveKnnAlgorithmConfiguration,
     ExhaustiveKnnParameters,
@@ -32,13 +32,13 @@
 
 @pytest.fixture(autouse=True)
 def azure_search_mock():
-    with patch("backend.batch.utilities.helpers.AzureSearchHelper.AzureSearch") as mock:
+    with patch("backend.batch.utilities.helpers.azure_search_helper.AzureSearch") as mock:
         yield mock
 
 
 @pytest.fixture(autouse=True)
 def llm_helper_mock():
-    with patch("backend.batch.utilities.helpers.AzureSearchHelper.LLMHelper") as mock:
+    with patch("backend.batch.utilities.helpers.azure_search_helper.LLMHelper") as mock:
         llm_helper = mock.return_value
         llm_helper.get_embedding_model.return_value.embed_query.return_value = [
             0
@@ -49,7 +49,7 @@ def llm_helper_mock():
 
 @pytest.fixture(autouse=True)
 def env_helper_mock():
-    with patch("backend.batch.utilities.helpers.AzureSearchHelper.EnvHelper") as mock:
+    with patch("backend.batch.utilities.helpers.azure_search_helper.EnvHelper") as mock:
         env_helper = mock.return_value
         env_helper.AZURE_AUTH_TYPE = AZURE_AUTH_TYPE
         env_helper.AZURE_SEARCH_KEY = AZURE_SEARCH_KEY
@@ -68,9 +68,9 @@ def env_helper_mock():
         yield env_helper
 
 
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchClient")
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchIndexClient")
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.AzureKeyCredential")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchIndexClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.AzureKeyCredential")
 def test_creates_search_clients_with_keys(
     azure_key_credential_mock: MagicMock,
     search_index_client_mock: MagicMock,
@@ -91,9 +91,9 @@ def test_creates_search_clients_with_keys(
     )
 
 
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchClient")
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchIndexClient")
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.DefaultAzureCredential")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchIndexClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.DefaultAzureCredential")
 def test_creates_search_clients_with_rabc(
     default_azure_credential_mock: MagicMock,
     search_index_client_mock: MagicMock,
@@ -119,8 +119,8 @@ def test_creates_search_clients_with_rabc(
     )
 
 
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchClient")
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchIndexClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchIndexClient")
 def test_returns_search_client(
     search_index_client_mock: MagicMock, search_client_mock: MagicMock
 ):
@@ -134,8 +134,8 @@ def test_returns_search_client(
     assert search_client is search_client_mock.return_value
 
 
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchClient")
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchIndexClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchIndexClient")
 def test_creates_search_index_if_not_exists(
     search_index_client_mock: MagicMock, search_client_mock: MagicMock
 ):
@@ -244,8 +244,8 @@ def test_creates_search_index_if_not_exists(
     )
 
 
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchClient")
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchIndexClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchIndexClient")
 def test_does_not_create_search_index_if_it_exists(
     search_index_client_mock: MagicMock,
     search_client_mock: MagicMock,
@@ -262,8 +262,8 @@ def test_does_not_create_search_index_if_it_exists(
     search_index_client_mock.return_value.create_index.assert_not_called()
 
 
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchClient")
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchIndexClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchIndexClient")
 def test_propogates_exceptions_when_creating_search_index(
     search_index_client_mock: MagicMock,
     search_client_mock: MagicMock,
@@ -280,8 +280,8 @@ def test_propogates_exceptions_when_creating_search_index(
     assert exc_info.value == expected_exception
 
 
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchClient")
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchIndexClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchIndexClient")
 def test_get_conversation_logger_keys(
     search_index_client_mock: MagicMock,
     search_client_mock: MagicMock,
@@ -307,8 +307,8 @@ def test_get_conversation_logger_keys(
     )
 
 
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchClient")
-@patch("backend.batch.utilities.helpers.AzureSearchHelper.SearchIndexClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchClient")
+@patch("backend.batch.utilities.helpers.azure_search_helper.SearchIndexClient")
 def test_get_conversation_logger_rbac(
     search_index_client_mock: MagicMock,
     search_client_mock: MagicMock,
diff --git a/code/tests/utilities/helpers/test_ConfigHelper.py b/code/tests/utilities/helpers/test_ConfigHelper.py
index b3fa8a23f..868697af1 100644
--- a/code/tests/utilities/helpers/test_ConfigHelper.py
+++ b/code/tests/utilities/helpers/test_ConfigHelper.py
@@ -1,8 +1,8 @@
 import json
 import pytest
 from unittest.mock import patch, MagicMock
-from backend.batch.utilities.helpers.config.ConfigHelper import ConfigHelper, Config
-from backend.batch.utilities.helpers.config.EmbeddingConfig import EmbeddingConfig
+from backend.batch.utilities.helpers.config.config_helper import ConfigHelper, Config
+from backend.batch.utilities.helpers.config.embedding_config import EmbeddingConfig
 from backend.batch.utilities.document_chunking.chunking_strategy import ChunkingSettings
 from backend.batch.utilities.document_loading import LoadingSettings
 
@@ -110,7 +110,7 @@ def config(config_dict: dict):
 @pytest.fixture(autouse=True)
 def AzureBlobStorageClientMock():
     with patch(
-        "backend.batch.utilities.helpers.config.ConfigHelper.AzureBlobStorageClient"
+        "backend.batch.utilities.helpers.config.config_helper.AzureBlobStorageClient"
     ) as mock:
         yield mock
 
@@ -125,7 +125,7 @@ def blob_client_mock(config_dict: dict, AzureBlobStorageClientMock: MagicMock):
 
 @pytest.fixture(autouse=True)
 def env_helper_mock():
-    with patch("backend.batch.utilities.helpers.config.ConfigHelper.EnvHelper") as mock:
+    with patch("backend.batch.utilities.helpers.config.config_helper.EnvHelper") as mock:
         env_helper = mock.return_value
         env_helper.ORCHESTRATION_STRATEGY = "openai_function"
         env_helper.LOAD_CONFIG_FROM_BLOB_STORAGE = True
@@ -222,7 +222,7 @@ def test_get_config_from_azure(
 
 
 @patch(
-    "backend.batch.utilities.helpers.config.ConfigHelper.ConfigHelper.get_default_config"
+    "backend.batch.utilities.helpers.config.config_helper.ConfigHelper.get_default_config"
 )
 def test_get_default_config_when_not_in_azure(
     get_default_config_mock: MagicMock,
@@ -396,7 +396,7 @@ def test_get_available_orchestration_strategies(config: Config):
 
 
 @patch(
-    "backend.batch.utilities.helpers.config.ConfigHelper.ConfigHelper.get_default_config"
+    "backend.batch.utilities.helpers.config.config_helper.ConfigHelper.get_default_config"
 )
 def test_loading_old_config(
     get_default_config_mock: MagicMock,
@@ -421,7 +421,7 @@ def test_loading_old_config(
 
 
 @patch(
-    "backend.batch.utilities.helpers.config.ConfigHelper.ConfigHelper.get_default_config"
+    "backend.batch.utilities.helpers.config.config_helper.ConfigHelper.get_default_config"
 )
 def test_loading_old_config_with_modified_prompt(
     get_default_config_mock: MagicMock,
diff --git a/code/tests/utilities/helpers/test_DocumentChunkingHelper.py b/code/tests/utilities/helpers/test_DocumentChunkingHelper.py
index 4fa3013e0..a44b4af80 100644
--- a/code/tests/utilities/helpers/test_DocumentChunkingHelper.py
+++ b/code/tests/utilities/helpers/test_DocumentChunkingHelper.py
@@ -1,5 +1,5 @@
 from backend.batch.utilities.common.SourceDocument import SourceDocument
-from backend.batch.utilities.helpers.DocumentChunkingHelper import DocumentChunking
+from backend.batch.utilities.helpers.document_chunking_helper import DocumentChunking
 from backend.batch.utilities.document_chunking.chunking_strategy import (
     ChunkingStrategy,
     ChunkingSettings,
diff --git a/code/tests/utilities/helpers/test_DocumentLoadingHelper.py b/code/tests/utilities/helpers/test_DocumentLoadingHelper.py
index df4e8b0be..bec56f2c6 100644
--- a/code/tests/utilities/helpers/test_DocumentLoadingHelper.py
+++ b/code/tests/utilities/helpers/test_DocumentLoadingHelper.py
@@ -1,5 +1,5 @@
 import pytest
-from backend.batch.utilities.helpers.DocumentLoadingHelper import (
+from backend.batch.utilities.helpers.document_loading_helper import (
     DocumentLoading,
     LoadingSettings,
 )
diff --git a/code/tests/utilities/helpers/test_EnvHelper.py b/code/tests/utilities/helpers/test_EnvHelper.py
index 49b0bf317..373d46108 100644
--- a/code/tests/utilities/helpers/test_EnvHelper.py
+++ b/code/tests/utilities/helpers/test_EnvHelper.py
@@ -1,6 +1,6 @@
 from pytest import MonkeyPatch
 import pytest
-from backend.batch.utilities.helpers.EnvHelper import EnvHelper
+from backend.batch.utilities.helpers.env_helper import EnvHelper
 
 
 @pytest.fixture(autouse=True)
diff --git a/code/tests/utilities/helpers/test_LLMHelper.py b/code/tests/utilities/helpers/test_LLMHelper.py
index db93fc169..66131347e 100644
--- a/code/tests/utilities/helpers/test_LLMHelper.py
+++ b/code/tests/utilities/helpers/test_LLMHelper.py
@@ -1,7 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from backend.batch.utilities.helpers.LLMHelper import LLMHelper
+from backend.batch.utilities.helpers.llm_helper import LLMHelper
 from semantic_kernel.connectors.ai.open_ai import AzureChatCompletion
 from openai.types.create_embedding_response import CreateEmbeddingResponse
 from openai.types.embedding import Embedding
@@ -17,7 +17,7 @@
 
 @pytest.fixture(autouse=True)
 def env_helper_mock():
-    with patch("backend.batch.utilities.helpers.LLMHelper.EnvHelper") as mock:
+    with patch("backend.batch.utilities.helpers.llm_helper.EnvHelper") as mock:
         env_helper = mock.return_value
         env_helper.is_auth_type_keys.return_value = True
         env_helper.AZURE_OPENAI_ENDPOINT = AZURE_OPENAI_ENDPOINT
@@ -32,11 +32,11 @@ def env_helper_mock():
 
 @pytest.fixture(autouse=True)
 def azure_openai_mock():
-    with patch("backend.batch.utilities.helpers.LLMHelper.AzureOpenAI") as mock:
+    with patch("backend.batch.utilities.helpers.llm_helper.AzureOpenAI") as mock:
         yield mock
 
 
-@patch("backend.batch.utilities.helpers.LLMHelper.AzureChatCompletion")
+@patch("backend.batch.utilities.helpers.llm_helper.AzureChatCompletion")
 def test_get_sk_chat_completion_service_keys(AzureChatCompletionMock: MagicMock):
     # given
     llm_helper = LLMHelper()
@@ -54,7 +54,7 @@ def test_get_sk_chat_completion_service_keys(AzureChatCompletionMock: MagicMock)
     )
 
 
-@patch("backend.batch.utilities.helpers.LLMHelper.AzureChatCompletion")
+@patch("backend.batch.utilities.helpers.llm_helper.AzureChatCompletion")
 def test_get_sk_chat_completion_service_rbac(
     AzureChatCompletionMock: MagicMock, env_helper_mock: MagicMock
 ):
diff --git a/code/tests/utilities/helpers/test_PushEmbedder.py b/code/tests/utilities/helpers/test_PushEmbedder.py
index 4b4c4657f..21de29880 100644
--- a/code/tests/utilities/helpers/test_PushEmbedder.py
+++ b/code/tests/utilities/helpers/test_PushEmbedder.py
@@ -1,12 +1,12 @@
 import json
 import pytest
 from unittest.mock import MagicMock, call, patch
-from backend.batch.utilities.helpers.embedders.PushEmbedder import PushEmbedder
+from backend.batch.utilities.helpers.embedders.push_embedder import PushEmbedder
 from backend.batch.utilities.document_chunking.chunking_strategy import ChunkingSettings
 from backend.batch.utilities.document_loading import LoadingSettings
 from backend.batch.utilities.document_loading.strategies import LoadingStrategy
 from backend.batch.utilities.common.SourceDocument import SourceDocument
-from backend.batch.utilities.helpers.config.EmbeddingConfig import EmbeddingConfig
+from backend.batch.utilities.helpers.config.embedding_config import EmbeddingConfig
 
 CHUNKING_SETTINGS = ChunkingSettings({"strategy": "layout", "size": 1, "overlap": 0})
 LOADING_SETTINGS = LoadingSettings({"strategy": LoadingStrategy.LAYOUT})
@@ -15,7 +15,7 @@
 @pytest.fixture(autouse=True)
 def llm_helper_mock():
     with patch(
-        "backend.batch.utilities.helpers.embedders.PushEmbedder.LLMHelper"
+        "backend.batch.utilities.helpers.embedders.push_embedder.LLMHelper"
     ) as mock:
         llm_helper = mock.return_value
         llm_helper.get_embedding_model.return_value.embed_query.return_value = [
@@ -28,7 +28,7 @@ def llm_helper_mock():
 @pytest.fixture(autouse=True)
 def azure_search_helper_mock():
     with patch(
-        "backend.batch.utilities.helpers.embedders.PushEmbedder.AzureSearchHelper"
+        "backend.batch.utilities.helpers.embedders.push_embedder.AzureSearchHelper"
     ) as mock:
         yield mock
 
@@ -36,7 +36,7 @@ def azure_search_helper_mock():
 @pytest.fixture(autouse=True)
 def mock_config_helper():
     with patch(
-        "backend.batch.utilities.helpers.embedders.PushEmbedder.ConfigHelper"
+        "backend.batch.utilities.helpers.embedders.push_embedder.ConfigHelper"
     ) as mock:
         config_helper = mock.get_active_config_or_default.return_value
         config_helper.document_processors = [
@@ -59,7 +59,7 @@ def mock_config_helper():
 @pytest.fixture(autouse=True)
 def document_loading_mock():
     with patch(
-        "backend.batch.utilities.helpers.embedders.PushEmbedder.DocumentLoading"
+        "backend.batch.utilities.helpers.embedders.push_embedder.DocumentLoading"
     ) as mock:
         expected_documents = [
             SourceDocument(content="some content", source="some source")
@@ -71,7 +71,7 @@ def document_loading_mock():
 @pytest.fixture(autouse=True)
 def document_chunking_mock():
     with patch(
-        "backend.batch.utilities.helpers.embedders.PushEmbedder.DocumentChunking"
+        "backend.batch.utilities.helpers.embedders.push_embedder.DocumentChunking"
     ) as mock:
         expected_chunked_documents = [
             SourceDocument(
diff --git a/code/tests/utilities/helpers/test_SecretHelper.py b/code/tests/utilities/helpers/test_SecretHelper.py
index f744c487a..f43214022 100644
--- a/code/tests/utilities/helpers/test_SecretHelper.py
+++ b/code/tests/utilities/helpers/test_SecretHelper.py
@@ -1,6 +1,6 @@
 from unittest.mock import MagicMock, patch
 from pytest import MonkeyPatch
-from backend.batch.utilities.helpers.EnvHelper import SecretHelper
+from backend.batch.utilities.helpers.env_helper import SecretHelper
 
 
 def test_get_secret_returns_value_from_environment_variables(monkeypatch: MonkeyPatch):
@@ -17,7 +17,7 @@ def test_get_secret_returns_value_from_environment_variables(monkeypatch: Monkey
     assert actual_value == expected_value
 
 
-@patch("backend.batch.utilities.helpers.EnvHelper.SecretClient")
+@patch("backend.batch.utilities.helpers.env_helper.SecretClient")
 def test_get_secret_returns_value_from_secret_client_when_use_key_vault_is_true(
     secret_client: MagicMock, monkeypatch: MonkeyPatch
 ):
diff --git a/code/tests/utilities/orchestrator/test_Orchestrator.py b/code/tests/utilities/orchestrator/test_Orchestrator.py
index 479f829cc..991fe4faa 100644
--- a/code/tests/utilities/orchestrator/test_Orchestrator.py
+++ b/code/tests/utilities/orchestrator/test_Orchestrator.py
@@ -1,5 +1,5 @@
 import pytest
-from backend.batch.utilities.helpers.OrchestratorHelper import (
+from backend.batch.utilities.helpers.orchestrator_helper import (
     Orchestrator,
     OrchestrationSettings,
 )
diff --git a/code/tests/utilities/test_AzureBlobStorageClient.py b/code/tests/utilities/test_AzureBlobStorageClient.py
index 2f1f7ed0a..678b9d906 100644
--- a/code/tests/utilities/test_AzureBlobStorageClient.py
+++ b/code/tests/utilities/test_AzureBlobStorageClient.py
@@ -1,6 +1,6 @@
 import pytest
 from unittest.mock import ANY, MagicMock, patch
-from backend.batch.utilities.helpers.AzureBlobStorageClient import (
+from backend.batch.utilities.helpers.azure_blob_storage_client import (
     AzureBlobStorageClient,
 )
 
@@ -8,7 +8,7 @@
 @pytest.fixture(autouse=True)
 def env_helper_mock():
     with patch(
-        "backend.batch.utilities.helpers.AzureBlobStorageClient.EnvHelper"
+        "backend.batch.utilities.helpers.azure_blob_storage_client.EnvHelper"
     ) as mock:
         env_helper = mock.return_value
         env_helper.AZURE_AUTH_TYPE = "keys"
@@ -22,7 +22,7 @@ def env_helper_mock():
 @pytest.fixture()
 def BlobServiceClientMock():
     with patch(
-        "backend.batch.utilities.helpers.AzureBlobStorageClient.BlobServiceClient"
+        "backend.batch.utilities.helpers.azure_blob_storage_client.BlobServiceClient"
     ) as mock:
         yield mock
 
@@ -46,8 +46,8 @@ def test_file_exists(BlobServiceClientMock: MagicMock, exists: bool, expected: b
     )
 
 
-@patch("backend.batch.utilities.helpers.AzureBlobStorageClient.generate_blob_sas")
-@patch("backend.batch.utilities.helpers.AzureBlobStorageClient.BlobServiceClient")
+@patch("backend.batch.utilities.helpers.azure_blob_storage_client.generate_blob_sas")
+@patch("backend.batch.utilities.helpers.azure_blob_storage_client.BlobServiceClient")
 @pytest.mark.parametrize(
     "content_type, expected_content_type, metadata",
     [("text/pdf", "text/pdf", {"title": "mock-file"}), (None, "text/plain", None)],
@@ -142,7 +142,7 @@ def test_upsert_blob_metadata(BlobServiceClientMock: MagicMock):
     )
 
 
-@patch("backend.batch.utilities.helpers.AzureBlobStorageClient.generate_blob_sas")
+@patch("backend.batch.utilities.helpers.azure_blob_storage_client.generate_blob_sas")
 def test_get_blob_sas(generate_blob_sas_mock: MagicMock):
     # given
     client = AzureBlobStorageClient()
@@ -167,7 +167,7 @@ def test_get_blob_sas(generate_blob_sas_mock: MagicMock):
     )
 
 
-@patch("backend.batch.utilities.helpers.AzureBlobStorageClient.generate_container_sas")
+@patch("backend.batch.utilities.helpers.azure_blob_storage_client.generate_container_sas")
 def test_get_container_sas(generate_container_sas_mock: MagicMock):
     # given
     client = AzureBlobStorageClient()