diff --git a/Apps/MAPL_GridCompSpecs_ACG.py b/Apps/MAPL_GridCompSpecs_ACG.py
index b65e51d3a808..990e4c63ee2a 100755
--- a/Apps/MAPL_GridCompSpecs_ACG.py
+++ b/Apps/MAPL_GridCompSpecs_ACG.py
@@ -73,16 +73,11 @@ def get_rank(self):
 
     @staticmethod
     def internal_name(name):
-        if name[-1] == '*':
-            return name[:-1]
-        else:
-            return name
+        return name.replace('*','')
+
     @staticmethod
     def mangled_name(name):
-        if name[-1] == '*':
-            return "'" + name[:-1] + "'//trim(comp_name)"
-        else:
-            return "'" + name + "'"
+        return "'" + name.replace("*","'//trim(comp_name)//'") + "'"
 
     # Pointers must be declared regardless of COND status.  Deactivated
     # pointers should not be _referenced_ but such sections should still
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 841fcaf4426a..79ae7924a2bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Replaced a wild card "*" in any position of a string in MAPL_GridCompSpecs_ACG.py   
 - Updated `MAPL_SunGetSolarConstantFromNRLFile` to open NRL Solar Table file only on root and broadcast the tables to all processes.  Now all processes do interpolation.
 - Add voting interpolation method as optional argument to SimpleBundleRead method