diff --git a/.gitattributes b/.gitattributes
index 009a3cbf34b8..e94e90be58bc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@
 *.bat        eol=crlf
 *.py         text
 *.json       text
+*.zip filter=lfs diff=lfs merge=lfs -text
diff --git a/src/ansys/fluent/core/filereader/case.py b/src/ansys/fluent/core/filereader/case.py
index 017981043d57..0659fd6ab6d7 100644
--- a/src/ansys/fluent/core/filereader/case.py
+++ b/src/ansys/fluent/core/filereader/case.py
@@ -24,8 +24,9 @@
 
 import h5py
 
+from ansys.fluent.core.solver.error_message import allowed_name_error_message
+
 from . import lispy
-from ..allowed_name_error_msg import allowed_name_error_message
 
 
 class InputParameter:
diff --git a/src/ansys/fluent/core/rpvars.py b/src/ansys/fluent/core/rpvars.py
index fa0528930d0d..682d4cc089d2 100644
--- a/src/ansys/fluent/core/rpvars.py
+++ b/src/ansys/fluent/core/rpvars.py
@@ -6,8 +6,8 @@
 """
 from typing import Any, List
 
-from ansys.fluent.core.allowed_name_error_msg import allowed_name_error_message
 import ansys.fluent.core.filereader.lispy as lispy
+from ansys.fluent.core.solver.error_message import allowed_name_error_message
 
 
 class RPVars:
diff --git a/src/ansys/fluent/core/services/field_data.py b/src/ansys/fluent/core/services/field_data.py
index 1da2cbb0f8cd..3613fe55084f 100644
--- a/src/ansys/fluent/core/services/field_data.py
+++ b/src/ansys/fluent/core/services/field_data.py
@@ -8,9 +8,9 @@
 
 from ansys.api.fluent.v0 import field_data_pb2 as FieldDataProtoModule
 from ansys.api.fluent.v0 import field_data_pb2_grpc as FieldGrpcModule
-from ansys.fluent.core.allowed_name_error_msg import allowed_name_error_message
 from ansys.fluent.core.services.error_handler import catch_grpc_error
 from ansys.fluent.core.services.interceptors import BatchInterceptor, TracingInterceptor
+from ansys.fluent.core.solver.error_message import allowed_name_error_message
 
 
 def override_help_text(func, func_to_be_wrapped):
diff --git a/src/ansys/fluent/core/solver/allowed_name_error_message.py b/src/ansys/fluent/core/solver/allowed_name_error_message.py
deleted file mode 100644
index e4538b7bb42c..000000000000
--- a/src/ansys/fluent/core/solver/allowed_name_error_message.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from ..allowed_name_error_msg import (  # noqa: F401
-    allowed_name_error_message,
-    allowed_values_error,
-)
diff --git a/src/ansys/fluent/core/allowed_name_error_msg.py b/src/ansys/fluent/core/solver/error_message.py
similarity index 100%
rename from src/ansys/fluent/core/allowed_name_error_msg.py
rename to src/ansys/fluent/core/solver/error_message.py
diff --git a/src/ansys/fluent/core/solver/flobject.py b/src/ansys/fluent/core/solver/flobject.py
index 222a8f9ffdf8..151d5ea82b40 100644
--- a/src/ansys/fluent/core/solver/flobject.py
+++ b/src/ansys/fluent/core/solver/flobject.py
@@ -25,7 +25,7 @@
 from typing import Any, Dict, Generic, List, NewType, Tuple, TypeVar, Union
 import weakref
 
-from .allowed_name_error_message import allowed_name_error_message, allowed_values_error
+from .error_message import allowed_name_error_message, allowed_values_error
 from .logging import LOG
 
 # Type hints