diff --git a/ets2panda/BUILD.gn b/ets2panda/BUILD.gn
index 60c32ea888d672fd753514e638086c66492cc36b..5e1fd3cbf83af410f33792b1ee3a8cd518537c9d 100644
--- a/ets2panda/BUILD.gn
+++ b/ets2panda/BUILD.gn
@@ -510,6 +510,7 @@ libes2panda_sources = [
   "util/es2pandaMacros.cpp",
   "util/helpers.cpp",
   "util/importPathManager.cpp",
+  "util/nameMangler.cpp",
   "util/path.cpp",
   "util/perfMetrics.cpp",
   "util/plugin.cpp",
diff --git a/ets2panda/CMakeLists.txt b/ets2panda/CMakeLists.txt
index 73d465ae3641b94bb806b297268f3b89e79e5884..cefac0672270b4c5e14c8dc96fb80a379714e724 100644
--- a/ets2panda/CMakeLists.txt
+++ b/ets2panda/CMakeLists.txt
@@ -648,6 +648,7 @@ set(ES2PANDA_LIB_SRC
   util/es2pandaMacros.cpp
   util/helpers.cpp
   util/importPathManager.cpp
+  util/nameMangler.cpp
   util/path.cpp
   util/plugin.cpp
   util/perfMetrics.cpp
diff --git a/ets2panda/checker/ETSchecker.h b/ets2panda/checker/ETSchecker.h
index b79f790e698d92f3d4a047b7f61508d47db11507..9db30bce7e7c24cfdb433f0575bc8f5d8a722e27 100644
--- a/ets2panda/checker/ETSchecker.h
+++ b/ets2panda/checker/ETSchecker.h
@@ -590,7 +590,6 @@ public:
     std::string FunctionalInterfaceInvokeName(size_t arity, bool hasRest);
     static std::string GetAsyncImplName(const util::StringView &name);
     static std::string GetAsyncImplName(ir::MethodDefinition *asyncMethod);
-    static bool IsAsyncImplMethod(ir::MethodDefinition const *method);
     std::vector<util::StringView> GetNameForSynteticObjectType(const util::StringView &source);
     template <checker::PropertyType TYPE>
     void BindingsModuleObjectAddProperty(checker::ETSObjectType *moduleObjType, ir::ETSImportDeclaration *importDecl,
diff --git a/ets2panda/checker/ets/assignAnalyzer.cpp b/ets2panda/checker/ets/assignAnalyzer.cpp
index 8d32f667b6cfffe464c40ce49c5a59cb9511617d..b83c82e1e4999b7a99ef9a94a8d34632a7137324 100644
--- a/ets2panda/checker/ets/assignAnalyzer.cpp
+++ b/ets2panda/checker/ets/assignAnalyzer.cpp
@@ -1300,7 +1300,7 @@ static const ir::AstNode *CheckInterfaceProp(const ark::es2panda::ir::AstNode *c
 {
     util::StringView methodName = node->AsMethodDefinition()->Key()->AsIdentifier()->Name();
     // the property from interface should start with <property> to distinguish from its getter/setter.
-    std::string interfaceProp = std::string("<property>") + std::string(methodName.Utf8());
+    std::string interfaceProp = std::string("%%property-") + std::string(methodName.Utf8());
     for (const auto it : classDef->Body()) {
         // Check if there is corresponding class property in the same class.
         if (it->IsClassProperty() && !it->IsStatic()) {
diff --git a/ets2panda/checker/ets/function.cpp b/ets2panda/checker/ets/function.cpp
index 53741e08a368c58d95d14380066221ed3084c3d6..5b26547d838069e1718496f3c52eedf4accd4b96 100644
--- a/ets2panda/checker/ets/function.cpp
+++ b/ets2panda/checker/ets/function.cpp
@@ -56,6 +56,7 @@
 #include "ir/ts/tsTypeParameterInstantiation.h"
 #include "parser/program/program.h"
 #include "util/helpers.h"
+#include "util/nameMangler.h"
 
 #include <compiler/lowering/util.h>
 
@@ -2208,9 +2209,9 @@ bool ETSChecker::IsReturnTypeSubstitutable(Signature *const s1, Signature *const
 
 std::string ETSChecker::GetAsyncImplName(const util::StringView &name)
 {
-    std::string implName(name);
-    implName += "$asyncimpl";
-    return implName;
+    std::string newName =
+        util::NameMangler::GetInstance()->CreateMangledNameByTypeAndName(util::NameMangler::ASYNC, name);
+    return newName;
 }
 
 std::string ETSChecker::GetAsyncImplName(ir::MethodDefinition *asyncMethod)
@@ -2222,16 +2223,6 @@ std::string ETSChecker::GetAsyncImplName(ir::MethodDefinition *asyncMethod)
     return GetAsyncImplName(asyncName->Name());
 }
 
-bool ETSChecker::IsAsyncImplMethod(ir::MethodDefinition const *method)
-{
-    auto methodName = method->Key()->AsIdentifier()->Name().Utf8();
-    std::string_view asyncSuffix = "$asyncimpl";
-    if (methodName.size() < asyncSuffix.size()) {
-        return false;
-    }
-    return methodName.substr(methodName.size() - asyncSuffix.size()) == asyncSuffix;
-}
-
 ir::MethodDefinition *ETSChecker::CreateMethod(const util::StringView &name, ir::ModifierFlags modifiers,
                                                ir::ScriptFunctionFlags flags, ArenaVector<ir::Expression *> &&params,
                                                varbinder::FunctionParamScope *paramScope, ir::TypeNode *returnType,
diff --git a/ets2panda/checker/ets/helpers.cpp b/ets2panda/checker/ets/helpers.cpp
index d7eb47097e04a64ef0fdde55a514c51c1444f146..204b5355af5223b981cab3bc7b7ca341e665987c 100644
--- a/ets2panda/checker/ets/helpers.cpp
+++ b/ets2panda/checker/ets/helpers.cpp
@@ -27,6 +27,7 @@
 #include "compiler/lowering/scopesInit/scopesInitPhase.h"
 #include "compiler/lowering/util.h"
 #include "util/helpers.h"
+#include "util/nameMangler.h"
 
 namespace ark::es2panda::checker {
 
@@ -2722,10 +2723,10 @@ static void ReInitScopesForTypeAnnotation(ETSChecker *checker, ir::TypeNode *typ
 
 ir::ClassProperty *ETSChecker::ClassPropToImplementationProp(ir::ClassProperty *classProp, varbinder::ClassScope *scope)
 {
-    classProp->Key()->AsIdentifier()->SetName(
-        util::UString(std::string(compiler::Signatures::PROPERTY) + classProp->Key()->AsIdentifier()->Name().Mutf8(),
-                      ProgramAllocator())
-            .View());
+    std::string newName = util::NameMangler::GetInstance()->CreateMangledNameByTypeAndName(
+        util::NameMangler::PROPERTY, classProp->Key()->AsIdentifier()->Name());
+
+    classProp->Key()->AsIdentifier()->SetName(util::UString(newName, ProgramAllocator()).View());
     classProp->AddModifier(ir::ModifierFlags::PRIVATE);
 
     auto *fieldDecl = ProgramAllocator()->New<varbinder::LetDecl>(classProp->Key()->AsIdentifier()->Name());
diff --git a/ets2panda/checker/ets/utilityTypeHandlers.cpp b/ets2panda/checker/ets/utilityTypeHandlers.cpp
index 3bc326155822b3d444b65c31076f1d1d42cf44ae..fa8cb0bbf9de059881a2856244114c9292ee080f 100644
--- a/ets2panda/checker/ets/utilityTypeHandlers.cpp
+++ b/ets2panda/checker/ets/utilityTypeHandlers.cpp
@@ -22,6 +22,7 @@
 #include "ir/expressions/literals/undefinedLiteral.h"
 #include "varbinder/ETSBinder.h"
 #include "checker/types/ets/etsPartialTypeParameter.h"
+#include "util/nameMangler.h"
 
 #include <checker/types/gradualType.h>
 
@@ -90,7 +91,9 @@ static std::pair<util::StringView, util::StringView> GetPartialClassName(ETSChec
 {
     // Partial class name for class 'T' will be 'T$partial'
     auto const addSuffix = [checker](util::StringView name) {
-        return util::UString(name.Mutf8() + PARTIAL_CLASS_SUFFIX, checker->ProgramAllocator()).View();
+        std::string newName =
+            util::NameMangler::GetInstance()->CreateMangledNameByTypeAndName(util::NameMangler::PARTIAL, name);
+        return util::UString(newName, checker->ProgramAllocator()).View();
     };
 
     auto declIdent = typeNode->IsClassDefinition() ? typeNode->AsClassDefinition()->Ident()
diff --git a/ets2panda/checker/types/ets/etsObjectType.h b/ets2panda/checker/types/ets/etsObjectType.h
index 2f81c4be7c98481b663be75eb3c0a94a6bb28383..85c6d455f82021a4d6820ad64b37d3efdd75bc12 100644
--- a/ets2panda/checker/types/ets/etsObjectType.h
+++ b/ets2panda/checker/types/ets/etsObjectType.h
@@ -32,7 +32,7 @@
 namespace ark::es2panda::checker {
 using PropertyProcesser = std::function<varbinder::LocalVariable *(varbinder::LocalVariable *, Type *)>;
 
-inline constexpr auto *PARTIAL_CLASS_SUFFIX = "$partial";
+inline constexpr auto *PARTIAL_CLASS_PREFIX = "%%partial-";
 
 class ETSObjectType : public Type {
 public:
@@ -332,7 +332,7 @@ public:
 
     [[nodiscard]] bool IsPartial() const noexcept
     {
-        return name_.EndsWith(PARTIAL_CLASS_SUFFIX);
+        return name_.StartsWith(PARTIAL_CLASS_PREFIX);
     }
 
     std::vector<const varbinder::LocalVariable *> ForeignProperties() const;
diff --git a/ets2panda/compiler/core/ETSemitter.cpp b/ets2panda/compiler/core/ETSemitter.cpp
index 71855bef27601abd5ed09716449966d169c24de7..4da7d669bffc01517c9a77c6411698abc5df42e5 100644
--- a/ets2panda/compiler/core/ETSemitter.cpp
+++ b/ets2panda/compiler/core/ETSemitter.cpp
@@ -41,6 +41,7 @@
 #include "checker/types/ets/types.h"
 #include "checker/types/ets/etsPartialTypeParameter.h"
 #include "public/public.h"
+#include "util/nameMangler.h"
 
 #include "assembly-program.h"
 
@@ -220,11 +221,6 @@ static pandasm::Function GenExternalFunction(checker::Signature *signature, bool
     return func;
 }
 
-static std::string GenerateMangledName(const std::string &baseName, const std::string &propName)
-{
-    return baseName + "$" + propName;
-}
-
 void FilterForSimultaneous(varbinder::ETSBinder *varbinder)
 {
     ArenaSet<ir::ClassDefinition *> &classDefinitions = varbinder->GetGlobalRecordTable()->ClassDefinitions();
@@ -258,7 +254,8 @@ void ETSEmitter::GenAnnotation()
     auto *globalRecordTable = varbinder->GetGlobalRecordTable();
     auto baseName = varbinder->GetRecordTable()->RecordName().Mutf8();
     for (auto *annoDecl : globalRecordTable->AnnotationDeclarations()) {
-        auto newBaseName = GenerateMangledName(baseName, annoDecl->GetBaseName()->Name().Mutf8());
+        std::string newBaseName = util::NameMangler::GetInstance()->CreateMangledNameForAnnotation(
+            baseName, annoDecl->GetBaseName()->Name().Mutf8());
         GenCustomAnnotationRecord(annoDecl, newBaseName, annoDecl->IsDeclare());
     }
 
@@ -318,7 +315,8 @@ void ETSEmitter::GenExternalRecord(varbinder::RecordTable *recordTable, const pa
     const auto *varbinder = static_cast<const varbinder::ETSBinder *>(Context()->parserProgram->VarBinder());
     auto baseName = varbinder->GetRecordTable()->RecordName().Mutf8();
     for (auto *annoDecl : recordTable->AnnotationDeclarations()) {
-        auto newBaseName = GenerateMangledName(baseName, annoDecl->GetBaseName()->Name().Mutf8());
+        std::string newBaseName = util::NameMangler::GetInstance()->CreateMangledNameForAnnotation(
+            baseName, annoDecl->GetBaseName()->Name().Mutf8());
         GenCustomAnnotationRecord(annoDecl, newBaseName, isExternalFromCompile || annoDecl->IsDeclare());
     }
 
@@ -786,8 +784,8 @@ LiteralArrayVector ETSEmitter::CreateLiteralArray(std::string &baseName, const i
         ProcessArrayElement(elem, literals, baseName, result);
     }
 
-    std::string litArrayName = GenerateMangledName(baseName, std::to_string(g_litArrayValueCount));
-    ++g_litArrayValueCount;
+    std::string litArrayName =
+        util::NameMangler::GetInstance()->AppendToAnnotationName(baseName, std::to_string(g_litArrayValueCount++));
     result.emplace_back(litArrayName, literals);
     return result;
 }
@@ -807,7 +805,7 @@ void ETSEmitter::CreateLiteralArrayProp(const ir::ClassProperty *prop, std::stri
 
     auto value = prop->Value();
     if (value != nullptr) {
-        std::string newBaseName = GenerateMangledName(baseName, field.name);
+        std::string newBaseName = util::NameMangler::GetInstance()->AppendToAnnotationName(baseName, field.name);
         auto litArray = CreateLiteralArray(newBaseName, value);
         for (const auto &item : litArray) {
             Program()->literalarrayTable.emplace(item.first, item.second);
@@ -868,7 +866,7 @@ pandasm::AnnotationElement ETSEmitter::ProcessArrayType(const ir::ClassProperty
 {
     ES2PANDA_ASSERT(prop->Id() != nullptr);
     auto propName = prop->Id()->Name().Mutf8();
-    std::string newBaseName = GenerateMangledName(baseName, propName);
+    std::string newBaseName = util::NameMangler::GetInstance()->AppendToAnnotationName(baseName, propName);
     auto litArrays = CreateLiteralArray(newBaseName, init);
 
     for (const auto &item : litArrays) {
@@ -942,7 +940,8 @@ std::vector<pandasm::AnnotationData> ETSEmitter::GenCustomAnnotations(
     for (auto *anno : annotationUsages) {
         auto *annoDecl = anno->GetBaseName()->Variable()->Declaration()->Node()->AsAnnotationDeclaration();
         if (!annoDecl->IsSourceRetention()) {
-            auto newBaseName = GenerateMangledName(baseName, anno->GetBaseName()->Name().Mutf8());
+            std::string newBaseName = util::NameMangler::GetInstance()->CreateMangledNameForAnnotation(
+                baseName, anno->GetBaseName()->Name().Mutf8());
             annotations.emplace_back(GenCustomAnnotation(anno, newBaseName));
         }
     }
diff --git a/ets2panda/compiler/lowering/ets/genericBridgesLowering.cpp b/ets2panda/compiler/lowering/ets/genericBridgesLowering.cpp
index e74ea9ce958031501326d405317cba0fd98355ad..0862e91ad77ca78234289ca0b433d44883dfbf02 100644
--- a/ets2panda/compiler/lowering/ets/genericBridgesLowering.cpp
+++ b/ets2panda/compiler/lowering/ets/genericBridgesLowering.cpp
@@ -208,7 +208,7 @@ static ir::MethodDefinition *FindBridgeCandidate(ir::ClassDefinition const *cons
 
     // Skip `static`, `final` and special methods...
     if (baseMethod->Kind() != ir::MethodDefinitionKind::METHOD || baseMethod->IsStatic() || baseMethod->IsFinal() ||
-        baseMethod->Id()->Name().Utf8().find("lambda$invoke$") != std::string_view::npos) {
+        baseMethod->Id()->Name().Utf8().find("lambda_invoke-") != std::string_view::npos) {
         return nullptr;
     }
 
diff --git a/ets2panda/compiler/lowering/ets/interfaceObjectLiteralLowering.cpp b/ets2panda/compiler/lowering/ets/interfaceObjectLiteralLowering.cpp
index 4998efb733f78c29999d516dbd1121855d97180b..65cd44cfd1f2c185ec097ef8714a83c357c8fdbd 100644
--- a/ets2panda/compiler/lowering/ets/interfaceObjectLiteralLowering.cpp
+++ b/ets2panda/compiler/lowering/ets/interfaceObjectLiteralLowering.cpp
@@ -20,6 +20,7 @@
 #include "generated/signatures.h"
 #include "ir/expressions/assignmentExpression.h"
 #include "util/helpers.h"
+#include "util/nameMangler.h"
 
 namespace ark::es2panda::compiler {
 
@@ -152,9 +153,8 @@ static void FillClassBody(public_lib::Context *ctx, ArenaVector<ir::AstNode *> *
         copyIfaceMethod->Function()->SetSignature(ifaceMethod->Function()->Signature());
 
         if (currentType != nullptr) {
-            auto instanProp =
-                currentType->GetOwnProperty<checker::PropertyType::INSTANCE_METHOD>(ifaceMethod->Id()->Name());
-            auto funcType = (instanProp != nullptr) ? instanProp->TsType() : nullptr;
+            auto prop = currentType->GetOwnProperty<checker::PropertyType::INSTANCE_METHOD>(ifaceMethod->Id()->Name());
+            auto funcType = (prop != nullptr) ? prop->TsType() : nullptr;
             if (funcType != nullptr) {
                 ES2PANDA_ASSERT(funcType->IsETSFunctionType() &&
                                 funcType->AsETSFunctionType()->FindGetter() != nullptr);
@@ -163,8 +163,9 @@ static void FillClassBody(public_lib::Context *ctx, ArenaVector<ir::AstNode *> *
         }
 
         // Field identifier
-        util::UString anonClassFieldName(
-            std::string(compiler::Signatures::PROPERTY) + ifaceMethod->Id()->Name().Mutf8(), ctx->allocator);
+        std::string newName = util::NameMangler::GetInstance()->CreateMangledNameByTypeAndName(
+            util::NameMangler::PROPERTY, ifaceMethod->Id()->Name());
+        util::UString anonClassFieldName(newName, ctx->allocator);
         auto *field = CreateAnonClassField(ctx, copyIfaceMethod, anonClassFieldName);
         if (field->IsReadonly()) {
             readonlyFields.push_back(
diff --git a/ets2panda/compiler/lowering/ets/lambdaLowering.cpp b/ets2panda/compiler/lowering/ets/lambdaLowering.cpp
index e4bd77c6fd66da9f5af2e0b91fe4d88acc987064..0dba30a208898b9b194f9b75f471caa66a51dd41 100644
--- a/ets2panda/compiler/lowering/ets/lambdaLowering.cpp
+++ b/ets2panda/compiler/lowering/ets/lambdaLowering.cpp
@@ -20,6 +20,7 @@
 #include "compiler/lowering/scopesInit/scopesInitPhase.h"
 #include "compiler/lowering/util.h"
 #include "util/options.h"
+#include "util/nameMangler.h"
 
 namespace ark::es2panda::compiler {
 
@@ -89,9 +90,10 @@ static void ResetCalleeCount()
 
 static util::StringView CreateCalleeName(ArenaAllocator *allocator)
 {
-    auto name = util::UString(util::StringView("lambda$invoke$"), allocator);
     std::lock_guard lock(g_calleeCountMutex);
-    name.Append(std::to_string(g_calleeCount++));
+    auto name = util::UString(
+        util::StringView(util::NameMangler::GetInstance()->CreateMangledNameForLambdaInvoke(g_calleeCount++)),
+        allocator);
     return name.View();
 }
 
@@ -962,12 +964,9 @@ static ir::ClassDeclaration *CreateEmptyLambdaClassDeclaration(public_lib::Conte
     auto *checker = ctx->GetChecker()->AsETSChecker();
     auto *varBinder = ctx->GetChecker()->VarBinder()->AsETSBinder();
 
-    auto lambdaClassName = util::UString {std::string_view {"LambdaObject-"}, allocator};
-
-    util::StringView &objectName = info->calleeClass != nullptr ? info->calleeClass->Definition()->Ident()->Name()
-                                                                : info->calleeInterface->Id()->Name();
+    auto lambdaClassName = util::UString {
+        std::string_view {util::NameMangler::GetInstance()->CreateMangledNameForLambdaObject(info->name)}, allocator};
 
-    lambdaClassName.Append(objectName).Append("$").Append(info->name);
     ES2PANDA_ASSERT(lambdaProviderClass);
     auto *providerTypeReference = checker->AllocNode<ir::ETSTypeReference>(
         checker->AllocNode<ir::ETSTypeReferencePart>(
diff --git a/ets2panda/compiler/lowering/ets/unionLowering.cpp b/ets2panda/compiler/lowering/ets/unionLowering.cpp
index 1710ce3ed435369006874e8868836757f14cc2ca..2b2bc2713fdbed47e05eae8118dd52a10b1ab2ee 100644
--- a/ets2panda/compiler/lowering/ets/unionLowering.cpp
+++ b/ets2panda/compiler/lowering/ets/unionLowering.cpp
@@ -19,11 +19,10 @@
 #include "compiler/lowering/util.h"
 #include "varbinder/ETSBinder.h"
 #include "checker/ETSchecker.h"
+#include "util/nameMangler.h"
 
 namespace ark::es2panda::compiler {
 
-static constexpr std::string_view PREFIX = "$NamedAccessMeta-";
-
 static void ReplaceAll(std::string &str, std::string_view substr, std::string_view replacement)
 {
     for (size_t pos = str.find(substr, 0); pos != std::string::npos; pos = str.find(substr, pos)) {
@@ -35,13 +34,10 @@ static void ReplaceAll(std::string &str, std::string_view substr, std::string_vi
 std::string GetAccessClassName(const checker::ETSUnionType *unionType)
 {
     std::stringstream ss;
-    ss << PREFIX;
     unionType->ToString(ss, false);
-    std::string res(ss.str());
-    std::replace(res.begin(), res.end(), '.', '-');
-    std::replace(res.begin(), res.end(), '|', '_');
-    ReplaceAll(res, "[]", "[$]$");
-    return res;
+    std::string newName = util::NameMangler::GetInstance()->CreateMangledNameForUnionProperty(ss.str());
+    ReplaceAll(newName, "[]", "[$]$");
+    return newName;
 }
 
 static ir::ClassDefinition *GetUnionAccessClass(public_lib::Context *ctx, varbinder::VarBinder *varbinder,
diff --git a/ets2panda/compiler/lowering/util.cpp b/ets2panda/compiler/lowering/util.cpp
index 865e9d1827b9d161c0c176f01eef75d344f621a1..9ecf01e80706e737e527cfa14859c0241bb98ddb 100644
--- a/ets2panda/compiler/lowering/util.cpp
+++ b/ets2panda/compiler/lowering/util.cpp
@@ -152,11 +152,11 @@ static bool IsGeneratedForUtilityType(ir::AstNode const *ast)
 {
     if (ast->IsClassDeclaration()) {
         auto &name = ast->AsClassDeclaration()->Definition()->Ident()->Name();
-        return name.EndsWith(checker::PARTIAL_CLASS_SUFFIX);
+        return name.StartsWith(checker::PARTIAL_CLASS_PREFIX);
     }
     if (ast->IsTSInterfaceDeclaration()) {
         auto &name = ast->AsTSInterfaceDeclaration()->Id()->Name();
-        return name.EndsWith(checker::PARTIAL_CLASS_SUFFIX);
+        return name.StartsWith(checker::PARTIAL_CLASS_PREFIX);
     }
     return false;
 }
diff --git a/ets2panda/compiler/scripts/signatures.yaml b/ets2panda/compiler/scripts/signatures.yaml
index 15dfcdbfe96bd5c3900cd74d7e3162fbbc665e31..65b3189118ea9c88f69f0a44447b6555651fc441 100644
--- a/ets2panda/compiler/scripts/signatures.yaml
+++ b/ets2panda/compiler/scripts/signatures.yaml
@@ -124,10 +124,6 @@ defines:
     ref: GENERIC_END
   - name: ctor
     ref: CONSTRUCTOR
-  - name: <get>
-    ref: GETTER_BEGIN
-  - name: <set>
-    ref: SETTER_BEGIN
   - name: param0
     ref: CTOR_PARAM0
   - name: param1
@@ -166,7 +162,7 @@ defines:
     ref: ARRAY
   - name: 'gradual'
     ref: GRADUAL_TYPE_NAME
-  - name: '<property>'
+  - name: '%%property-'
     ref: PROPERTY
   - name: 'Any'
     ref: ANY_TYPE_NAME
@@ -771,7 +767,7 @@ signatures:
     ref: BUILTIN_STRING_CHAR_AT
 
   - callee: BUILTIN_ARRAY
-    method_name: <get>length
+    method_name: '%%get-length'
     params: []
     return_type: PRIMITIVE_DOUBLE
     ref: BUILTIN_ARRAY_LENGTH
diff --git a/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp b/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp
index f1a78d5555550fe1dd38ca0629d3b1b98c1a215d..eccdaf1162f83bccd56dcd81f83c80982b1f645a 100644
--- a/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp
+++ b/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp
@@ -573,7 +573,7 @@ void TSDeclGen::ProcessParameterName(varbinder::LocalVariable *param)
 
 void TSDeclGen::ProcessFuncParameter(varbinder::LocalVariable *param)
 {
-    if (std::string(param->Name()).find("<property>") != std::string::npos) {
+    if (std::string(param->Name()).find("%%property-") != std::string::npos) {
         return;
     }
 
@@ -827,7 +827,7 @@ void TSDeclGen::GenObjectType(const checker::ETSObjectType *objectType)
     } else {
         if (typeStr == "Exception" || typeStr == "NullPointerError") {
             OutDts("Error");
-        } else if (size_t partialPos = typeStr.find("$partial"); partialPos != std::string::npos) {
+        } else if (size_t partialPos = typeStr.find("%%partial-"); partialPos != std::string::npos) {
             OutDts("Partial<", typeStr.substr(0, partialPos), ">");
         } else {
             OutDts(typeStr);
@@ -1562,7 +1562,7 @@ void TSDeclGen::GenInterfaceDeclaration(const ir::TSInterfaceDeclaration *interf
 {
     const auto interfaceName = interfaceDecl->Id()->Name().Mutf8();
     DebugPrint("GenInterfaceDeclaration: " + interfaceName);
-    if (interfaceName.find("$partial") != std::string::npos) {
+    if (interfaceName.find("%%partial-") != std::string::npos) {
         return;
     }
     if (!ShouldEmitDeclarationSymbol(interfaceDecl->Id())) {
@@ -1709,7 +1709,7 @@ void TSDeclGen::PrepareClassDeclaration(const ir::ClassDefinition *classDef)
 bool TSDeclGen::ShouldSkipClassDeclaration(const std::string_view &className) const
 {
     return className == compiler::Signatures::DYNAMIC_MODULE_CLASS || className == compiler::Signatures::JSNEW_CLASS ||
-           className == compiler::Signatures::JSCALL_CLASS || (className.find("$partial") != std::string::npos);
+           className == compiler::Signatures::JSCALL_CLASS || (className.find("%%partial-") != std::string::npos);
 }
 
 void TSDeclGen::EmitDeclarationPrefix(const ir::ClassDefinition *classDef, const std::string &typeName,
@@ -1883,7 +1883,7 @@ void TSDeclGen::ProcessClassBody(const ir::ClassDefinition *classDef)
         } else if (prop->IsClassProperty()) {
             const auto classProp = prop->AsClassProperty();
             const auto propName = GetKeyIdent(classProp->Key())->Name().Mutf8();
-            if (propName.find("<property>") != std::string::npos) {
+            if (propName.find("%%property-") != std::string::npos) {
                 continue;
             }
             GenPropDeclaration(classProp);
@@ -1961,7 +1961,7 @@ bool TSDeclGen::ShouldSkipMethodDeclaration(const ir::MethodDefinition *methodDe
 {
     const auto methodIdent = GetKeyIdent(methodDef->Key());
     const auto methodName = methodIdent->Name().Mutf8();
-    if (methodName.find('#') != std::string::npos || methodName.find("$asyncimpl") != std::string::npos ||
+    if (methodName.find('#') != std::string::npos || methodName.find("%%async-") != std::string::npos ||
         (!state_.inGlobalClass && (methodName == compiler::Signatures::INIT_METHOD ||
                                    methodName == compiler::Signatures::INITIALIZER_BLOCK_INIT))) {
         return true;
diff --git a/ets2panda/ir/base/methodDefinition.cpp b/ets2panda/ir/base/methodDefinition.cpp
index d2ac48bf3d10ca8a0ef73724832cb06667c0647e..2f3525a480e1cd00c029ea7f29a03e94ef8f1995 100644
--- a/ets2panda/ir/base/methodDefinition.cpp
+++ b/ets2panda/ir/base/methodDefinition.cpp
@@ -301,7 +301,7 @@ bool MethodDefinition::FilterForDeclGen(ir::SrcDumper *dumper) const
 
     ES2PANDA_ASSERT(Id() != nullptr);
     auto name = Id()->Name().Mutf8();
-    if (name.find("$asyncimpl") != std::string::npos || name == compiler::Signatures::INITIALIZER_BLOCK_INIT ||
+    if (name.find("%%async") != std::string::npos || name == compiler::Signatures::INITIALIZER_BLOCK_INIT ||
         name == compiler::Signatures::INIT_METHOD) {
         return true;
     }
diff --git a/ets2panda/ir/expressions/identifier.cpp b/ets2panda/ir/expressions/identifier.cpp
index 57419e853914b1d62f72e90cb909b73ab99b197e..6ead156f75612e7dc5df35e90923972af953d91a 100644
--- a/ets2panda/ir/expressions/identifier.cpp
+++ b/ets2panda/ir/expressions/identifier.cpp
@@ -159,6 +159,7 @@ void Identifier::Dump(ir::SrcDumper *dumper) const
 
     auto name = std::string(Name());
     std::string propertyStr = compiler::Signatures::PROPERTY.data();
+    propertyStr += "-";
     if (UNLIKELY(name.find(propertyStr) != std::string::npos)) {
         name.replace(name.find(propertyStr), propertyStr.length(), "_$property$_");
     }
diff --git a/ets2panda/lsp/src/generate_constructor.cpp b/ets2panda/lsp/src/generate_constructor.cpp
index b78c0c223a369488b744b71284ff3ad28f7db741..9799a493f5823b382c2c9f4068065753cf1b36d2 100644
--- a/ets2panda/lsp/src/generate_constructor.cpp
+++ b/ets2panda/lsp/src/generate_constructor.cpp
@@ -185,7 +185,7 @@ void GetParameterListAndFunctionBody(std::string &parameterList, std::string &fu
     std::vector<std::string> strVec = {};
     for (auto propertyNode : nodeList) {
         auto nodeName = GetIdentifierName(propertyNode);
-        auto propertyName = FilterSubstring(nodeName, "<property>");
+        auto propertyName = FilterSubstring(nodeName, "%%property-");
         ark::es2panda::ir::TypeNode *typeAnnotation = nullptr;
         if (propertyNode->IsETSParameterExpression()) {
             typeAnnotation = propertyNode->AsETSParameterExpression()->TypeAnnotation();
diff --git a/ets2panda/lsp/src/get_class_property_info.cpp b/ets2panda/lsp/src/get_class_property_info.cpp
index 750d24fd84f4b49791d7adb62b786f544bea7554..4e6c497c6de153bf2fb88575514f6b280de5f8f3 100644
--- a/ets2panda/lsp/src/get_class_property_info.cpp
+++ b/ets2panda/lsp/src/get_class_property_info.cpp
@@ -72,7 +72,7 @@ void CollectClassProperties(const ir::AstNode *classNode, std::vector<FieldsInfo
 
         std::string name = GetIdentifierName(property);
 
-        constexpr auto K_PROPERTY_PREFIX = "<property>";
+        constexpr auto K_PROPERTY_PREFIX = "%%property-";
         constexpr std::size_t K_PROPERTY_PREFIX_LENGTH = std::char_traits<char>::length(K_PROPERTY_PREFIX);
         if (name.size() >= K_PROPERTY_PREFIX_LENGTH &&
             name.compare(0, K_PROPERTY_PREFIX_LENGTH, K_PROPERTY_PREFIX) == 0) {
diff --git a/ets2panda/lsp/src/isolated_declaration.cpp b/ets2panda/lsp/src/isolated_declaration.cpp
index 77f06d2da7ae35876a82c166d868c86a8942a97d..fd714cfde352fb66959de9e6e38df7b21bb73bdc 100644
--- a/ets2panda/lsp/src/isolated_declaration.cpp
+++ b/ets2panda/lsp/src/isolated_declaration.cpp
@@ -131,8 +131,8 @@ std::optional<std::string> GenObjectType(const checker::ETSObjectType *objectTyp
 
         return std::nullopt;
     }
-    if (size_t partialPos = typeStr.find("$partial"); partialPos != std::string::npos) {
-        return "Partial<" + typeStr.substr(0, partialPos) + ">";
+    if (size_t partialPos = typeStr.find("%%partial-"); partialPos != std::string::npos) {
+        return "Partial<" + typeStr.substr(partialPos) + ">";
     }
     return typeStr;
 }
diff --git a/ets2panda/scripts/arkui.properties b/ets2panda/scripts/arkui.properties
index 84783ad66044ea30e01be80f4d9f8307635ea1a0..f6b32ba1d1b5306cc3300c112d8f3dab4051d964 100644
--- a/ets2panda/scripts/arkui.properties
+++ b/ets2panda/scripts/arkui.properties
@@ -1,3 +1,3 @@
 ARKUI_DEV_REPO=https://gitee.com/rri_opensource/koala_projects.git
-ARKUI_DEV_BRANCH=panda_rev_9-ani-add-bind-static
+ARKUI_DEV_BRANCH=panda_rev_9-fix-mangled-names
 ARKUI_DEST=koala-sig
diff --git a/ets2panda/test/ast/compiler/ets/interface_partial.ets b/ets2panda/test/ast/compiler/ets/interface_partial.ets
index f3f836c47b1a14c13b0265dba3a438f2ffd6c519..769ff5cc44a4e42e16983ee277298f2b94f483ce 100644
--- a/ets2panda/test/ast/compiler/ets/interface_partial.ets
+++ b/ets2panda/test/ast/compiler/ets/interface_partial.ets
@@ -31,8 +31,8 @@ function main() {
 }
 
 /* @@? 18:1 Error SyntaxError: Invalid Type. */
-/* @@? 21:13 Error TypeError: Property 'var_one' does not exist on type 'I$partial' */
-/* @@? 22:13 Error TypeError: Property 'var_one' does not exist on type 'I$partial' */
+/* @@? 21:13 Error TypeError: Property 'var_one' does not exist on type '%%partial-I' */
+/* @@? 22:13 Error TypeError: Property 'var_one' does not exist on type '%%partial-I' */
 /* @@? 27:18 Error TypeError: type I has no property named var_one */
 /* @@? 28:11 Error TypeError: Property 'var_one' does not exist on type 'I' */
 /* @@? 29:9 Error TypeError: Variable 'a' has already been declared. */
diff --git a/ets2panda/test/ast/parser/ets/partial_interface.ets b/ets2panda/test/ast/parser/ets/partial_interface.ets
index f0d6fddb59e1a72ba38ce5eaad39ce4a7c64f641..836bc68d2e85dc19c9633d369fc2b4439a6aa016 100644
--- a/ets2panda/test/ast/parser/ets/partial_interface.ets
+++ b/ets2panda/test/ast/parser/ets/partial_interface.ets
@@ -32,6 +32,6 @@ function main(){
     partial4.i = 100;
 }
 
-/* @@? 28:32 Error TypeError: type I$partial has no property named a */
+/* @@? 28:32 Error TypeError: type %%partial-I has no property named a */
 /* @@? 29:34 Error TypeError: Type '"abcd"' is not compatible with type 'Int|undefined' at property 'i' */
 /* @@? 32:14 Error TypeError: Cannot assign to this property because it is readonly. */
diff --git a/ets2panda/test/runtime/ets/interfaceObjPropertyName.ets b/ets2panda/test/runtime/ets/interfaceObjPropertyName.ets
index 16f084cf340baa08f49291496f4601f5ff96d1ae..e7a2bbeaedf0b5da2e9faf0fa0fcf01086cf7207 100644
--- a/ets2panda/test/runtime/ets/interfaceObjPropertyName.ets
+++ b/ets2panda/test/runtime/ets/interfaceObjPropertyName.ets
@@ -18,5 +18,5 @@ interface A {
 }
 let a : A = {name:"name"}
 
-arktest.assertEQ(((reflect.Value.of(a)) as ClassValue).getFieldByName("<property>name").toString(), "name")
+arktest.assertEQ(((reflect.Value.of(a)) as ClassValue).getFieldByName("%%property-name").toString(), "name")
 
diff --git a/ets2panda/test/test-lists/astchecker/astchecker-ets-ignored.txt b/ets2panda/test/test-lists/astchecker/astchecker-ets-ignored.txt
index 39fca20a23bb4827269bbf22837d27f0df5f54b4..944970ef443e313b14334d722f4898f580b0d38a 100644
--- a/ets2panda/test/test-lists/astchecker/astchecker-ets-ignored.txt
+++ b/ets2panda/test/test-lists/astchecker/astchecker-ets-ignored.txt
@@ -168,4 +168,7 @@ ast/parser/ets/staticFunctionCallOfObject.ets
 # Issue: #27365 Cannot add correct comment to astchecker to see warning with 0:0 position (duplicate export warning)
 ast/compiler/ets/export_type_class_multiple_times.ets
 ast/compiler/ets/export_type_interface_multiple_times.ets
-ast/compiler/ets/import_tests/export_multi_error.ets
\ No newline at end of file
+ast/compiler/ets/import_tests/export_multi_error.ets
+
+# #21301 - skipped, because of mangling. Temporary.
+ast/parser/ets/getterOverrideGen_n.ets
diff --git a/ets2panda/test/unit/CMakeLists.txt b/ets2panda/test/unit/CMakeLists.txt
index 0d4c20f3e599456a6a09b59b89859efae1e91f9c..80624e7dddba2d16652860b3aa9de304712c058a 100644
--- a/ets2panda/test/unit/CMakeLists.txt
+++ b/ets2panda/test/unit/CMakeLists.txt
@@ -33,6 +33,10 @@ ets2panda_add_gtest(es2panda_astdumper_tests
     CPP_SOURCES ast_dumper_test.cpp
 )
 
+ets2panda_add_gtest(es2panda_name_mangling_tests
+    CPP_SOURCES name_mangling_test.cpp
+)
+
 ets2panda_add_gtest(es2panda_union_normalization_tests_1
     CPP_SOURCES union_normalization_test_1.cpp
 )
diff --git a/ets2panda/test/unit/annotations/annotations_for_interface.cpp b/ets2panda/test/unit/annotations/annotations_for_interface.cpp
index 4664cbd221fefe37f8d223225f8e355d5e86c8e0..8ce6d7b0f3a763b52390d12dc5d915e27a9d5ffb 100644
--- a/ets2panda/test/unit/annotations/annotations_for_interface.cpp
+++ b/ets2panda/test/unit/annotations/annotations_for_interface.cpp
@@ -66,8 +66,8 @@ public:
 
     void CheckFunctionAnnotations(pandasm::Program *program)
     {
-        const std::string getter = "A.<get>x:i32;";
-        const std::string setter = "A.<set>x:i32;void;";
+        const std::string getter = "A.%%get-x:i32;";
+        const std::string setter = "A.%%set-x:i32;void;";
         const std::string funcName = "A.foo:void;";
         const AnnotationMap expectedFuncAnnotations1 = {
             {"Anno",
diff --git a/ets2panda/test/unit/annotations/mutiple_annotations_for_class.cpp b/ets2panda/test/unit/annotations/mutiple_annotations_for_class.cpp
index 4e7ef99a40eaa92134fff763275814ce845eeeca..68f1b30f6ef830bda7bb983acb5ac3be05f1ebd6 100644
--- a/ets2panda/test/unit/annotations/mutiple_annotations_for_class.cpp
+++ b/ets2panda/test/unit/annotations/mutiple_annotations_for_class.cpp
@@ -43,8 +43,8 @@ public:
         const std::vector<std::pair<std::string, std::string>> expectedAnnotations = {
             {
                 {"favorColor", "1"},
-                {"color", "ETSGLOBAL$Anno2$color$0"},
-                {"reviewers", "ETSGLOBAL$Anno2$reviewers$1"},
+                {"color", "ETSGLOBAL%%annotation-Anno2-color-0"},
+                {"reviewers", "ETSGLOBAL%%annotation-Anno2-reviewers-1"},
             },
         };
         AnnotationEmitTest::CheckAnnoDecl(program, annoName, expectedAnnotations);
@@ -63,14 +63,14 @@ public:
             {"Anno2",
              {
                  {"favorColor", "1"},
-                 {"color", "A$Anno2$color$2"},
-                 {"reviewers", "A$Anno2$reviewers$3"},
+                 {"color", "A%%annotation-Anno2-color-2"},
+                 {"reviewers", "A%%annotation-Anno2-reviewers-3"},
              }},
             {"Anno3",
              {
-                 {"reviewersAge", "A$Anno3$reviewersAge$4"},
-                 {"testBools", "A$Anno3$testBools$5"},
-                 {"mutiArray", "A$Anno3$mutiArray$9"},
+                 {"reviewersAge", "A%%annotation-Anno3-reviewersAge-4"},
+                 {"testBools", "A%%annotation-Anno3-testBools-5"},
+                 {"mutiArray", "A%%annotation-Anno3-mutiArray-9"},
              }},
         };
         AnnotationEmitTest::CheckRecordAnnotations(program, recordName, expectedClassAnnotations);
@@ -79,21 +79,22 @@ public:
     void CheckLiteralArrayTable(pandasm::Program *program)
     {
         std::vector<std::pair<std::string, std::vector<AnnotationValueType>>> expectedLiteralArrayTable = {
-            {"ETSGLOBAL$Anno2$color$0", std::vector<AnnotationValueType> {COLOR_0, COLOR_1}},
-            {"ETSGLOBAL$Anno2$reviewers$1",
+            {"ETSGLOBAL%%annotation-Anno2-color-0", std::vector<AnnotationValueType> {COLOR_0, COLOR_1}},
+            {"ETSGLOBAL%%annotation-Anno2-reviewers-1",
              std::vector<AnnotationValueType> {std::string("Bob"), std::string("Jim"), std::string("Tom")}},
-            {"A$Anno2$color$2", std::vector<AnnotationValueType> {COLOR_0, COLOR_1}},
-            {"A$Anno2$reviewers$3",
+            {"A%%annotation-Anno2-color-2", std::vector<AnnotationValueType> {COLOR_0, COLOR_1}},
+            {"A%%annotation-Anno2-reviewers-3",
              std::vector<AnnotationValueType> {std::string("Bob"), std::string("Jim"), std::string("Tom")}},
-            {"A$Anno3$reviewersAge$4",
+            {"A%%annotation-Anno3-reviewersAge-4",
              std::vector<AnnotationValueType> {REVIEWER_AGE_19, REVIEWER_AGE_20, REVIEWER_AGE_24}},
-            {"A$Anno3$testBools$5", std::vector<AnnotationValueType> {true, true, true}},
-            {"A$Anno3$mutiArray$6", std::vector<AnnotationValueType> {VALUE_9, VALUE_8, VALUE_7}},
-            {"A$Anno3$mutiArray$7", std::vector<AnnotationValueType> {VALUE_6, VALUE_5, VALUE_4}},
-            {"A$Anno3$mutiArray$8", std::vector<AnnotationValueType> {VALUE_3, VALUE_2, VALUE_1}},
-            {"A$Anno3$mutiArray$9",
-             std::vector<AnnotationValueType> {std::string("A$Anno3$mutiArray$6"), std::string("A$Anno3$mutiArray$7"),
-                                               std::string("A$Anno3$mutiArray$8")}}};
+            {"A%%annotation-Anno3-testBools-5", std::vector<AnnotationValueType> {true, true, true}},
+            {"A%%annotation-Anno3-mutiArray-6", std::vector<AnnotationValueType> {VALUE_9, VALUE_8, VALUE_7}},
+            {"A%%annotation-Anno3-mutiArray-7", std::vector<AnnotationValueType> {VALUE_6, VALUE_5, VALUE_4}},
+            {"A%%annotation-Anno3-mutiArray-8", std::vector<AnnotationValueType> {VALUE_3, VALUE_2, VALUE_1}},
+            {"A%%annotation-Anno3-mutiArray-9",
+             std::vector<AnnotationValueType> {std::string("A%%annotation-Anno3-mutiArray-6"),
+                                               std::string("A%%annotation-Anno3-mutiArray-7"),
+                                               std::string("A%%annotation-Anno3-mutiArray-8")}}};
 
         AnnotationEmitTest::CheckLiteralArrayTable(program, expectedLiteralArrayTable);
     }
diff --git a/ets2panda/test/unit/annotations/mutiple_annotations_for_function.cpp b/ets2panda/test/unit/annotations/mutiple_annotations_for_function.cpp
index a1998a7aace69106aacdd0e20914355b15366a71..8d74727e6fc2a69058b71869d91c3fe8699b891c 100644
--- a/ets2panda/test/unit/annotations/mutiple_annotations_for_function.cpp
+++ b/ets2panda/test/unit/annotations/mutiple_annotations_for_function.cpp
@@ -50,7 +50,7 @@ public:
         const std::string annoName1 = "Anno2";
         const std::vector<std::pair<std::string, std::string>> expectedAnnotation1 = {
             {
-                {"param", "ETSGLOBAL$Anno2$param$0"},
+                {"param", "ETSGLOBAL%%annotation-Anno2-param-0"},
             },
         };
         AnnotationEmitTest::CheckAnnoDecl(program, annoName1, expectedAnnotation1);
@@ -58,7 +58,7 @@ public:
         const std::string annoName2 = "Anno3";
         const std::vector<std::pair<std::string, std::string>> expectedAnnotation2 = {
             {
-                {"param", "ETSGLOBAL$Anno3$param$10"},
+                {"param", "ETSGLOBAL%%annotation-Anno3-param-10"},
             },
         };
         AnnotationEmitTest::CheckAnnoDecl(program, annoName2, expectedAnnotation2);
@@ -68,18 +68,19 @@ public:
     {
         const std::string functionName1 = "ETSGLOBAL.foo:void;";
         const std::string functionName2 = "ETSGLOBAL.foo1:void;";
-        const AnnotationMap expectedFuncAnnotations1 = {{"Anno1",
-                                                         {
-                                                             {"value", "2"},
-                                                         }},
-                                                        {"Anno2",
-                                                         {
-                                                             {"value", "ETSGLOBAL.foo:void;$Anno2$value$11"},
-                                                         }},
-                                                        {"Anno3",
-                                                         {
-                                                             {"param", "ETSGLOBAL.foo:void;$Anno3$param$21"},
-                                                         }}};
+        const AnnotationMap expectedFuncAnnotations1 = {
+            {"Anno1",
+             {
+                 {"value", "2"},
+             }},
+            {"Anno2",
+             {
+                 {"value", "ETSGLOBAL.foo:void;%%annotation-Anno2-value-11"},
+             }},
+            {"Anno3",
+             {
+                 {"param", "ETSGLOBAL.foo:void;%%annotation-Anno3-param-21"},
+             }}};
         const AnnotationMap expectedFuncAnnotations2 = {{"Anno1",
                                                          {
                                                              {"value", "2"},
@@ -91,42 +92,46 @@ public:
     void CheckLiteralArrayTable(pandasm::Program *program)
     {
         std::vector<std::pair<std::string, std::vector<AnnotationValueType>>> expectedLiteralArrayTable = {
-            {"ETSGLOBAL$Anno2$param$0", std::vector<AnnotationValueType> {1U, 2U, 3U, 4U}},
-            {"ETSGLOBAL$Anno3$param$1", std::vector<AnnotationValueType> {1U}},
-            {"ETSGLOBAL$Anno3$param$2", std::vector<AnnotationValueType> {2U}},
-            {"ETSGLOBAL$Anno3$param$3", std::vector<AnnotationValueType> {std::string("ETSGLOBAL$Anno3$param$1"),
-                                                                          std::string("ETSGLOBAL$Anno3$param$2")}},
-            {"ETSGLOBAL$Anno3$param$4", std::vector<AnnotationValueType> {2U}},
-            {"ETSGLOBAL$Anno3$param$5", std::vector<AnnotationValueType> {3U}},
-            {"ETSGLOBAL$Anno3$param$6", std::vector<AnnotationValueType> {std::string("ETSGLOBAL$Anno3$param$4"),
-                                                                          std::string("ETSGLOBAL$Anno3$param$5")}},
-            {"ETSGLOBAL$Anno3$param$7", std::vector<AnnotationValueType> {3U}},
-            {"ETSGLOBAL$Anno3$param$8", std::vector<AnnotationValueType> {4U}},
-            {"ETSGLOBAL$Anno3$param$9", std::vector<AnnotationValueType> {std::string("ETSGLOBAL$Anno3$param$7"),
-                                                                          std::string("ETSGLOBAL$Anno3$param$8")}},
-            {"ETSGLOBAL$Anno3$param$10", std::vector<AnnotationValueType> {std::string("ETSGLOBAL$Anno3$param$3"),
-                                                                           std::string("ETSGLOBAL$Anno3$param$6"),
-                                                                           std::string("ETSGLOBAL$Anno3$param$9")}},
-            {"ETSGLOBAL.foo:void;$Anno2$value$11", std::vector<AnnotationValueType> {4U, 5U, 6U, 7U}},
-            {"ETSGLOBAL.foo:void;$Anno3$param$12", std::vector<AnnotationValueType> {1U}},
-            {"ETSGLOBAL.foo:void;$Anno3$param$13", std::vector<AnnotationValueType> {2U}},
-            {"ETSGLOBAL.foo:void;$Anno3$param$14",
-             std::vector<AnnotationValueType> {std::string("ETSGLOBAL.foo:void;$Anno3$param$12"),
-                                               std::string("ETSGLOBAL.foo:void;$Anno3$param$13")}},
-            {"ETSGLOBAL.foo:void;$Anno3$param$15", std::vector<AnnotationValueType> {2U}},
-            {"ETSGLOBAL.foo:void;$Anno3$param$16", std::vector<AnnotationValueType> {3U}},
-            {"ETSGLOBAL.foo:void;$Anno3$param$17",
-             std::vector<AnnotationValueType> {std::string("ETSGLOBAL.foo:void;$Anno3$param$15"),
-                                               std::string("ETSGLOBAL.foo:void;$Anno3$param$16")}},
-            {"ETSGLOBAL.foo:void;$Anno3$param$18", std::vector<AnnotationValueType> {3U}},
-            {"ETSGLOBAL.foo:void;$Anno3$param$19", std::vector<AnnotationValueType> {4U}},
-            {"ETSGLOBAL.foo:void;$Anno3$param$20",
-             std::vector<AnnotationValueType> {std::string("ETSGLOBAL.foo:void;$Anno3$param$18"),
-                                               std::string("ETSGLOBAL.foo:void;$Anno3$param$19")}},
-            {"ETSGLOBAL.foo:void;$Anno3$param$21",
-             std::vector<AnnotationValueType> {std::string("ETSGLOBAL.foo:void;$Anno3$param$14"),
-                                               std::string("ETSGLOBAL.foo:void;$Anno3$param$17"),
-                                               std::string("ETSGLOBAL.foo:void;$Anno3$param$20")}},
+            {"ETSGLOBAL%%annotation-Anno2-param-0", std::vector<AnnotationValueType> {1U, 2U, 3U, 4U}},
+            {"ETSGLOBAL%%annotation-Anno3-param-1", std::vector<AnnotationValueType> {1U}},
+            {"ETSGLOBAL%%annotation-Anno3-param-2", std::vector<AnnotationValueType> {2U}},
+            {"ETSGLOBAL%%annotation-Anno3-param-3",
+             std::vector<AnnotationValueType> {std::string("ETSGLOBAL%%annotation-Anno3-param-1"),
+                                               std::string("ETSGLOBAL%%annotation-Anno3-param-2")}},
+            {"ETSGLOBAL%%annotation-Anno3-param-4", std::vector<AnnotationValueType> {2U}},
+            {"ETSGLOBAL%%annotation-Anno3-param-5", std::vector<AnnotationValueType> {3U}},
+            {"ETSGLOBAL%%annotation-Anno3-param-6",
+             std::vector<AnnotationValueType> {std::string("ETSGLOBAL%%annotation-Anno3-param-4"),
+                                               std::string("ETSGLOBAL%%annotation-Anno3-param-5")}},
+            {"ETSGLOBAL%%annotation-Anno3-param-7", std::vector<AnnotationValueType> {3U}},
+            {"ETSGLOBAL%%annotation-Anno3-param-8", std::vector<AnnotationValueType> {4U}},
+            {"ETSGLOBAL%%annotation-Anno3-param-9",
+             std::vector<AnnotationValueType> {std::string("ETSGLOBAL%%annotation-Anno3-param-7"),
+                                               std::string("ETSGLOBAL%%annotation-Anno3-param-8")}},
+            {"ETSGLOBAL%%annotation-Anno3-param-10",
+             std::vector<AnnotationValueType> {std::string("ETSGLOBAL%%annotation-Anno3-param-3"),
+                                               std::string("ETSGLOBAL%%annotation-Anno3-param-6"),
+                                               std::string("ETSGLOBAL%%annotation-Anno3-param-9")}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno2-value-11", std::vector<AnnotationValueType> {4U, 5U, 6U, 7U}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno3-param-12", std::vector<AnnotationValueType> {1U}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno3-param-13", std::vector<AnnotationValueType> {2U}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno3-param-14",
+             std::vector<AnnotationValueType> {std::string("ETSGLOBAL.foo:void;%%annotation-Anno3-param-12"),
+                                               std::string("ETSGLOBAL.foo:void;%%annotation-Anno3-param-13")}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno3-param-15", std::vector<AnnotationValueType> {2U}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno3-param-16", std::vector<AnnotationValueType> {3U}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno3-param-17",
+             std::vector<AnnotationValueType> {std::string("ETSGLOBAL.foo:void;%%annotation-Anno3-param-15"),
+                                               std::string("ETSGLOBAL.foo:void;%%annotation-Anno3-param-16")}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno3-param-18", std::vector<AnnotationValueType> {3U}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno3-param-19", std::vector<AnnotationValueType> {4U}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno3-param-20",
+             std::vector<AnnotationValueType> {std::string("ETSGLOBAL.foo:void;%%annotation-Anno3-param-18"),
+                                               std::string("ETSGLOBAL.foo:void;%%annotation-Anno3-param-19")}},
+            {"ETSGLOBAL.foo:void;%%annotation-Anno3-param-21",
+             std::vector<AnnotationValueType> {std::string("ETSGLOBAL.foo:void;%%annotation-Anno3-param-14"),
+                                               std::string("ETSGLOBAL.foo:void;%%annotation-Anno3-param-17"),
+                                               std::string("ETSGLOBAL.foo:void;%%annotation-Anno3-param-20")}},
         };
 
         AnnotationEmitTest::CheckLiteralArrayTable(program, expectedLiteralArrayTable);
diff --git a/ets2panda/test/unit/annotations/standard_test.cpp b/ets2panda/test/unit/annotations/standard_test.cpp
index fde486b3b678fc4af093a84f3856c6d7c26f7060..5d22aed167e3f107514f200766663900c0ba6200 100644
--- a/ets2panda/test/unit/annotations/standard_test.cpp
+++ b/ets2panda/test/unit/annotations/standard_test.cpp
@@ -52,11 +52,11 @@ public:
             {"authorAge", "35.000000"},
             {"testBool", "0"},
             {"favorColor", "1"},
-            {"color", "ETSGLOBAL$ClassAuthor$color$0"},
-            {"reviewers", "ETSGLOBAL$ClassAuthor$reviewers$1"},
-            {"reviewersAge", "ETSGLOBAL$ClassAuthor$reviewersAge$2"},
-            {"testBools", "ETSGLOBAL$ClassAuthor$testBools$3"},
-            {"mutiArray", "ETSGLOBAL$ClassAuthor$mutiArray$7"},
+            {"color", "ETSGLOBAL%%annotation-ClassAuthor-color-0"},
+            {"reviewers", "ETSGLOBAL%%annotation-ClassAuthor-reviewers-1"},
+            {"reviewersAge", "ETSGLOBAL%%annotation-ClassAuthor-reviewersAge-2"},
+            {"testBools", "ETSGLOBAL%%annotation-ClassAuthor-testBools-3"},
+            {"mutiArray", "ETSGLOBAL%%annotation-ClassAuthor-mutiArray-7"},
         };
         AnnotationEmitTest::CheckAnnoDecl(program, annoName, expectedAnnotations);
     }
@@ -71,11 +71,11 @@ public:
                  {"authorAge", "35.000000"},
                  {"testBool", "0"},
                  {"favorColor", "1"},
-                 {"color", "MyClass$ClassAuthor$color$12"},
-                 {"reviewers", "MyClass$ClassAuthor$reviewers$14"},
-                 {"reviewersAge", "MyClass$ClassAuthor$reviewersAge$15"},
-                 {"testBools", "MyClass$ClassAuthor$testBools$13"},
-                 {"mutiArray", "MyClass$ClassAuthor$mutiArray$11"},
+                 {"color", "MyClass%%annotation-ClassAuthor-color-12"},
+                 {"reviewers", "MyClass%%annotation-ClassAuthor-reviewers-14"},
+                 {"reviewersAge", "MyClass%%annotation-ClassAuthor-reviewersAge-15"},
+                 {"testBools", "MyClass%%annotation-ClassAuthor-testBools-13"},
+                 {"mutiArray", "MyClass%%annotation-ClassAuthor-mutiArray-11"},
              }},
         };
         AnnotationEmitTest::CheckRecordAnnotations(program, recordName, expectedClassAnnotations);
@@ -87,13 +87,13 @@ public:
         const AnnotationMap expectedFuncAnnotations = {
             {"ClassAuthor",
              {
-                 {"mutiArray", "MyClass.foo:void;$ClassAuthor$mutiArray$19"},
-                 {"color", "MyClass.foo:void;$ClassAuthor$color$20"},
-                 {"testBools", "MyClass.foo:void;$ClassAuthor$testBools$21"},
-                 {"reviewers", "MyClass.foo:void;$ClassAuthor$reviewers$22"},
+                 {"mutiArray", "MyClass.foo:void;%%annotation-ClassAuthor-mutiArray-19"},
+                 {"color", "MyClass.foo:void;%%annotation-ClassAuthor-color-20"},
+                 {"testBools", "MyClass.foo:void;%%annotation-ClassAuthor-testBools-21"},
+                 {"reviewers", "MyClass.foo:void;%%annotation-ClassAuthor-reviewers-22"},
                  {"favorColor", "1"},
                  {"testBool", "0"},
-                 {"reviewersAge", "MyClass.foo:void;$ClassAuthor$reviewersAge$23"},
+                 {"reviewersAge", "MyClass.foo:void;%%annotation-ClassAuthor-reviewersAge-23"},
                  {"authorAge", "35.000000"},
                  {"authorName", "Jim"},
              }},
@@ -104,52 +104,77 @@ public:
     void CheckLiteralArrayTable(pandasm::Program *program)
     {
         std::vector<std::pair<std::string, std::vector<AnnotationValueType>>> expectedLiteralArrayTable = {
-            {"ETSGLOBAL$ClassAuthor$color$0", std::vector<AnnotationValueType> {COLOR_OPTION_0, COLOR_OPTION_1}},
-            {"ETSGLOBAL$ClassAuthor$reviewers$1",
-             std::vector<AnnotationValueType> {std::string("Bob"), std::string("Jim"), std::string("Tom")}},
-            {"ETSGLOBAL$ClassAuthor$reviewersAge$2", std::vector<AnnotationValueType> {AGE_18, AGE_21, AGE_32}},
-            {"ETSGLOBAL$ClassAuthor$testBools$3", std::vector<AnnotationValueType> {false, true, false}},
-            {"ETSGLOBAL$ClassAuthor$mutiArray$4", std::vector<AnnotationValueType> {VALUE_1, VALUE_2, VALUE_3}},
-            {"ETSGLOBAL$ClassAuthor$mutiArray$5", std::vector<AnnotationValueType> {VALUE_4, VALUE_5, VALUE_6}},
-            {"ETSGLOBAL$ClassAuthor$mutiArray$6", std::vector<AnnotationValueType> {VALUE_7, VALUE_8, VALUE_9}},
-            {"ETSGLOBAL$ClassAuthor$mutiArray$7",
-             std::vector<AnnotationValueType> {std::string("ETSGLOBAL$ClassAuthor$mutiArray$4"),
-                                               std::string("ETSGLOBAL$ClassAuthor$mutiArray$5"),
-                                               std::string("ETSGLOBAL$ClassAuthor$mutiArray$6")}},
-            {"MyClass$ClassAuthor$color$12", std::vector<AnnotationValueType> {COLOR_OPTION_0, COLOR_OPTION_1}},
-            {"MyClass$ClassAuthor$reviewers$14",
+            {"ETSGLOBAL%%annotation-ClassAuthor-color-0",
+             std::vector<AnnotationValueType> {COLOR_OPTION_0, COLOR_OPTION_1}},
+            {"ETSGLOBAL%%annotation-ClassAuthor-reviewers-1",
              std::vector<AnnotationValueType> {std::string("Bob"), std::string("Jim"), std::string("Tom")}},
-            {"MyClass$ClassAuthor$reviewersAge$15", std::vector<AnnotationValueType> {AGE_18, AGE_21, AGE_32}},
-            {"MyClass$ClassAuthor$testBools$13", std::vector<AnnotationValueType> {false, true, false}},
-            {"MyClass$ClassAuthor$mutiArray$8", std::vector<AnnotationValueType> {VALUE_1, VALUE_2, VALUE_3}},
-            {"MyClass$ClassAuthor$mutiArray$9", std::vector<AnnotationValueType> {VALUE_4, VALUE_5, VALUE_6}},
-            {"MyClass$ClassAuthor$mutiArray$10", std::vector<AnnotationValueType> {VALUE_7, VALUE_8, VALUE_9}},
-            {"MyClass$ClassAuthor$mutiArray$11",
-             std::vector<AnnotationValueType> {std::string("MyClass$ClassAuthor$mutiArray$8"),
-                                               std::string("MyClass$ClassAuthor$mutiArray$9"),
-                                               std::string("MyClass$ClassAuthor$mutiArray$10")}},
-            {"MyClass.foo:void;$ClassAuthor$color$20",
+            {"ETSGLOBAL%%annotation-ClassAuthor-reviewersAge-2",
+             std::vector<AnnotationValueType> {AGE_18, AGE_21, AGE_32}},
+            {"ETSGLOBAL%%annotation-ClassAuthor-testBools-3", std::vector<AnnotationValueType> {false, true, false}},
+            {"ETSGLOBAL%%annotation-ClassAuthor-mutiArray-4",
+             std::vector<AnnotationValueType> {VALUE_1, VALUE_2, VALUE_3}},
+            {"ETSGLOBAL%%annotation-ClassAuthor-mutiArray-5",
+             std::vector<AnnotationValueType> {VALUE_4, VALUE_5, VALUE_6}},
+            {"ETSGLOBAL%%annotation-ClassAuthor-mutiArray-6",
+             std::vector<AnnotationValueType> {VALUE_7, VALUE_8, VALUE_9}},
+            {"ETSGLOBAL%%annotation-ClassAuthor-mutiArray-7",
+             std::vector<AnnotationValueType> {std::string("ETSGLOBAL%%annotation-ClassAuthor-mutiArray-4"),
+                                               std::string("ETSGLOBAL%%annotation-ClassAuthor-mutiArray-5"),
+                                               std::string("ETSGLOBAL%%annotation-ClassAuthor-mutiArray-6")}},
+            {"MyClass%%annotation-ClassAuthor-color-12",
              std::vector<AnnotationValueType> {COLOR_OPTION_0, COLOR_OPTION_1}},
-            {"MyClass.foo:void;$ClassAuthor$reviewers$22",
+            {"MyClass%%annotation-ClassAuthor-reviewers-14",
              std::vector<AnnotationValueType> {std::string("Bob"), std::string("Jim"), std::string("Tom")}},
-            {"MyClass.foo:void;$ClassAuthor$reviewersAge$23",
+            {"MyClass%%annotation-ClassAuthor-reviewersAge-15",
              std::vector<AnnotationValueType> {AGE_18, AGE_21, AGE_32}},
-            {"MyClass.foo:void;$ClassAuthor$testBools$21", std::vector<AnnotationValueType> {false, true, false}},
-            {"MyClass.foo:void;$ClassAuthor$mutiArray$16",
+            {"MyClass%%annotation-ClassAuthor-testBools-13", std::vector<AnnotationValueType> {false, true, false}},
+            {"MyClass%%annotation-ClassAuthor-mutiArray-8",
              std::vector<AnnotationValueType> {VALUE_1, VALUE_2, VALUE_3}},
-            {"MyClass.foo:void;$ClassAuthor$mutiArray$17",
+            {"MyClass%%annotation-ClassAuthor-mutiArray-9",
              std::vector<AnnotationValueType> {VALUE_4, VALUE_5, VALUE_6}},
-            {"MyClass.foo:void;$ClassAuthor$mutiArray$18",
+            {"MyClass%%annotation-ClassAuthor-mutiArray-10",
              std::vector<AnnotationValueType> {VALUE_7, VALUE_8, VALUE_9}},
-            {"MyClass.foo:void;$ClassAuthor$mutiArray$19",
-             std::vector<AnnotationValueType> {std::string("MyClass.foo:void;$ClassAuthor$mutiArray$16"),
-                                               std::string("MyClass.foo:void;$ClassAuthor$mutiArray$17"),
-                                               std::string("MyClass.foo:void;$ClassAuthor$mutiArray$18")}},
         };
 
+        std::vector<std::pair<std::string, std::vector<AnnotationValueType>>> remainingExpectedValues =
+            GetRemainingExpectedValues();
+        expectedLiteralArrayTable.insert(expectedLiteralArrayTable.end(), remainingExpectedValues.begin(),
+                                         remainingExpectedValues.end());
+
         AnnotationEmitTest::CheckLiteralArrayTable(program, expectedLiteralArrayTable);
     }
 
+    // After the new name mangling names, the expected values array was too long to fit the 50 lines rule.
+    std::vector<std::pair<std::string, std::vector<AnnotationValueType>>> GetRemainingExpectedValues()
+    {
+        std::vector<std::pair<std::string, std::vector<AnnotationValueType>>> expectedArray = {
+            {"MyClass%%annotation-ClassAuthor-mutiArray-11",
+             std::vector<AnnotationValueType> {std::string("MyClass%%annotation-ClassAuthor-mutiArray-8"),
+                                               std::string("MyClass%%annotation-ClassAuthor-mutiArray-9"),
+                                               std::string("MyClass%%annotation-ClassAuthor-mutiArray-10")}},
+            {"MyClass.foo:void;%%annotation-ClassAuthor-color-20",
+             std::vector<AnnotationValueType> {COLOR_OPTION_0, COLOR_OPTION_1}},
+            {"MyClass.foo:void;%%annotation-ClassAuthor-reviewers-22",
+             std::vector<AnnotationValueType> {std::string("Bob"), std::string("Jim"), std::string("Tom")}},
+            {"MyClass.foo:void;%%annotation-ClassAuthor-reviewersAge-23",
+             std::vector<AnnotationValueType> {AGE_18, AGE_21, AGE_32}},
+            {"MyClass.foo:void;%%annotation-ClassAuthor-testBools-21",
+             std::vector<AnnotationValueType> {false, true, false}},
+            {"MyClass.foo:void;%%annotation-ClassAuthor-mutiArray-16",
+             std::vector<AnnotationValueType> {VALUE_1, VALUE_2, VALUE_3}},
+            {"MyClass.foo:void;%%annotation-ClassAuthor-mutiArray-17",
+             std::vector<AnnotationValueType> {VALUE_4, VALUE_5, VALUE_6}},
+            {"MyClass.foo:void;%%annotation-ClassAuthor-mutiArray-18",
+             std::vector<AnnotationValueType> {VALUE_7, VALUE_8, VALUE_9}},
+            {"MyClass.foo:void;%%annotation-ClassAuthor-mutiArray-19",
+             std::vector<AnnotationValueType> {std::string("MyClass.foo:void;%%annotation-ClassAuthor-mutiArray-16"),
+                                               std::string("MyClass.foo:void;%%annotation-ClassAuthor-mutiArray-17"),
+                                               std::string("MyClass.foo:void;%%annotation-ClassAuthor-mutiArray-18")}},
+        };
+
+        return expectedArray;
+    }
+
 private:
     NO_COPY_SEMANTIC(StandardEmitTest);
     NO_MOVE_SEMANTIC(StandardEmitTest);
diff --git a/ets2panda/test/unit/ets_specific_optimizer/ets_reg_acc_alloc_test.cpp b/ets2panda/test/unit/ets_specific_optimizer/ets_reg_acc_alloc_test.cpp
index c0251cda46b043384f8a5e110ea1ecb47542927a..df1c18b93da6a734150cd75096b1ef4061f99177 100644
--- a/ets2panda/test/unit/ets_specific_optimizer/ets_reg_acc_alloc_test.cpp
+++ b/ets2panda/test/unit/ets_specific_optimizer/ets_reg_acc_alloc_test.cpp
@@ -57,7 +57,7 @@ TEST_F(RegAccAllocTest, Ets_Ldobj)
     pandasm::Parser p;
     auto source = std::string(R"(
         .language eTS
-        .record $NamedAccessMeta-std.core.String {
+        .record %%union_prop-std_core_String {
             std.core.String status
         }
         .record ETSGLOBAL <ets.abstract, ets.extends=std.core.Object, access.record=public> {
@@ -73,7 +73,7 @@ TEST_F(RegAccAllocTest, Ets_Ldobj)
             ldai 0x1
             ldarr.obj v0
             sta.obj v0
-            ets.ldobj.name.obj v0, $NamedAccessMeta-std.core.String.status
+            ets.ldobj.name.obj v0, %%union_prop-std_core_String.status
             return.void
         }
         )");
diff --git a/ets2panda/test/unit/name_mangling_test.cpp b/ets2panda/test/unit/name_mangling_test.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c973142b1f908e7c5dc580071e5297b4a16fb7b9
--- /dev/null
+++ b/ets2panda/test/unit/name_mangling_test.cpp
@@ -0,0 +1,127 @@
+/**
+ * Copyright (c) 2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "gtest/gtest.h"
+#include "util/nameMangler.h"
+#include "util/ustring.h"
+
+using ark::es2panda::util::NameMangler;
+using ark::es2panda::util::StringView;
+
+class TestNameMangling : public ::testing::Test {
+private:
+    NameMangler *mangler_ = nullptr;
+
+    void SetUp() override
+    {
+        mangler_ = NameMangler::GetInstance();
+    }
+
+public:
+    NameMangler *GetMangler()
+    {
+        return mangler_;
+    }
+};
+
+TEST_F(TestNameMangling, asyncNameGen)
+{
+    std::string mangledName =
+        GetMangler()->CreateMangledNameByTypeAndName(NameMangler::LangFeatureType::ASYNC, "testFunc");
+    std::string expectedResult = "%%async-testFunc";
+
+    EXPECT_EQ(mangledName, expectedResult);
+}
+
+TEST_F(TestNameMangling, enumNameGen)
+{
+    std::string mangledName =
+        GetMangler()->CreateMangledNameByTypeAndName(NameMangler::LangFeatureType::ENUM, "TestEnum");
+    std::string expectedResult = "%%enum-TestEnum";
+
+    EXPECT_EQ(mangledName, expectedResult);
+}
+
+TEST_F(TestNameMangling, getterNameGen)
+{
+    std::string mangledName = GetMangler()->CreateMangledNameByTypeAndName(NameMangler::LangFeatureType::GET, "myProp");
+    std::string expectedResult = "%%get-myProp";
+
+    EXPECT_EQ(mangledName, expectedResult);
+}
+
+TEST_F(TestNameMangling, partialNameGen)
+{
+    std::string mangledName =
+        GetMangler()->CreateMangledNameByTypeAndName(NameMangler::LangFeatureType::PARTIAL, "MyPartialClass");
+    std::string expectedResult = "%%partial-MyPartialClass";
+
+    EXPECT_EQ(mangledName, expectedResult);
+}
+
+TEST_F(TestNameMangling, propertyNameGen)
+{
+    std::string mangledName =
+        GetMangler()->CreateMangledNameByTypeAndName(NameMangler::LangFeatureType::PROPERTY, "myProp");
+    std::string expectedResult = "%%property-myProp";
+
+    EXPECT_EQ(mangledName, expectedResult);
+}
+
+TEST_F(TestNameMangling, setterNameGen)
+{
+    std::string mangledName = GetMangler()->CreateMangledNameByTypeAndName(NameMangler::LangFeatureType::SET, "myProp");
+    std::string expectedResult = "%%set-myProp";
+
+    EXPECT_EQ(mangledName, expectedResult);
+}
+
+TEST_F(TestNameMangling, lambdaInvokeNameGen)
+{
+    size_t counter = 0;
+    std::string mangledName = GetMangler()->CreateMangledNameForLambdaInvoke(counter++);
+    std::string expectedResult = "lambda_invoke-0";
+
+    EXPECT_EQ(mangledName, expectedResult);
+
+    mangledName = GetMangler()->CreateMangledNameForLambdaInvoke(counter++);
+    expectedResult = "lambda_invoke-1";
+
+    EXPECT_EQ(mangledName, expectedResult);
+}
+
+TEST_F(TestNameMangling, lambdaObjNameGen)
+{
+    size_t counter = 0;
+    std::string lambdaInvokeName = GetMangler()->CreateMangledNameForLambdaInvoke(counter++);
+    std::string mangledName = GetMangler()->CreateMangledNameForLambdaObject(StringView(lambdaInvokeName));
+    std::string expectedResult = "%%lambda-lambda_invoke-0";
+
+    EXPECT_EQ(mangledName, expectedResult);
+
+    lambdaInvokeName = GetMangler()->CreateMangledNameForLambdaInvoke(counter++);
+    mangledName = GetMangler()->CreateMangledNameForLambdaObject(StringView(lambdaInvokeName));
+    expectedResult = "%%lambda-lambda_invoke-1";
+
+    EXPECT_EQ(mangledName, expectedResult);
+}
+
+TEST_F(TestNameMangling, unionPropNameGen)
+{
+    std::string mangledName = GetMangler()->CreateMangledNameForUnionProperty("std.core.Double");
+    std::string expectedResult = "%%union_prop-std_core_Double";
+
+    EXPECT_EQ(mangledName, expectedResult);
+}
diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_interface_duplicate_setter.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_interface_duplicate_setter.cpp
index 66cacf08fea22ef1439331d275775a39f4222915..6d0770d64fb1d5b2cb36482e61c648bbc693e8b3 100644
--- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_interface_duplicate_setter.cpp
+++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_test_interface_duplicate_setter.cpp
@@ -84,7 +84,13 @@ int main(int argc, char **argv)
     impl->DestroyContext(context);
     impl->DestroyConfig(config);
 
-    // Rerun es2panda on dumped source
+    /* Note (oeotvos) issue: #21301
+    This causes massive problems for name mangling, because it runs es2panda on the dumped source
+    code, which contains mangled names. When we chose the special character for mangling, the point was for it to not be
+    parsable, so the user cannot use it in their code. Because of this I commented out the remaining part of the
+    test.
+
+    //  Rerun es2panda on dumped source
     config = impl->CreateConfig(argc - 1, args);
     context = impl->CreateContextFromString(config, dump.data(), argv[argc - 1]);
     if (context != nullptr) {
@@ -98,7 +104,7 @@ int main(int argc, char **argv)
         return PROCEED_ERROR_CODE;
     }
     impl->DestroyContext(context);
-    impl->DestroyConfig(config);
+    impl->DestroyConfig(config); */
 
     return 0;
 }
diff --git a/ets2panda/test/unit/rest_parameter_flag_test.cpp b/ets2panda/test/unit/rest_parameter_flag_test.cpp
index 026166d78b578892b17dcc7397be85f028d086c9..dee24643a6b468f509eea8aa9a399afb2e3bd846 100644
--- a/ets2panda/test/unit/rest_parameter_flag_test.cpp
+++ b/ets2panda/test/unit/rest_parameter_flag_test.cpp
@@ -265,7 +265,7 @@ TEST_F(RestParameterTest, lambda_without_rest_parameters_0)
             return 1;
         }
     )");
-    CheckNoRestParameterFlag("dummy.ETSGLOBAL.lambda$invoke$0:i32;", true);
+    CheckNoRestParameterFlag("dummy.ETSGLOBAL.lambda_invoke-0:i32;", true);
 }
 
 TEST_F(RestParameterTest, lambda_without_rest_parameters_1)
@@ -275,7 +275,7 @@ TEST_F(RestParameterTest, lambda_without_rest_parameters_1)
             return 1;
         }
     )");
-    CheckNoRestParameterFlag("dummy.ETSGLOBAL.lambda$invoke$0:i64[];i32;", true);
+    CheckNoRestParameterFlag("dummy.ETSGLOBAL.lambda_invoke-0:i64[];i32;", true);
 }
 
 // === Abstract method of abstract class ===
diff --git a/ets2panda/util/nameMangler.cpp b/ets2panda/util/nameMangler.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7012d8571aa13a0d611cec5c08a6f232b08a7d78
--- /dev/null
+++ b/ets2panda/util/nameMangler.cpp
@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) 2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "nameMangler.h"
+
+namespace ark::es2panda::util {
+std::string NameMangler::CreateMangledNameByTypeAndName(LangFeatureType type, const util::StringView &nodeName)
+{
+    ES2PANDA_ASSERT(!nodeName.Empty());
+
+    int lastPos = nodeName.Mutf8().find_last_of('.') + 1;
+    std::string mangledName = nodeName.Mutf8().substr(0, lastPos) + "%%";
+    int counter = -1;
+
+    switch (type) {
+        case ASYNC: {
+            mangledName += "async";
+            break;
+        }
+        case ENUM: {
+            mangledName += "enum";
+            break;
+        }
+        case GET: {
+            mangledName += "get";
+            break;
+        }
+        case PARTIAL: {
+            mangledName += "partial";
+            break;
+        }
+        case PROPERTY: {
+            mangledName += "property";
+            break;
+        }
+        case SET: {
+            mangledName += "set";
+            break;
+        }
+        default:
+            ES2PANDA_UNREACHABLE();
+    }
+
+    mangledName += "-" + nodeName.Mutf8().substr(lastPos);
+
+    return (counter != -1) ? mangledName += "-" + std::to_string(counter) : mangledName;
+}
+
+std::string NameMangler::CreateMangledNameForLambdaInvoke(size_t invokeCounter)
+{
+    std::string mangledName = "lambda_invoke";
+
+    mangledName += "-" + std::to_string(invokeCounter);
+    return mangledName;
+}
+
+std::string NameMangler::CreateMangledNameForLambdaObject(const util::StringView &lambdaInvokeName)
+{
+    ES2PANDA_ASSERT(!lambdaInvokeName.Empty());
+
+    std::string mangledName = "%%lambda-";
+
+    mangledName += lambdaInvokeName.Mutf8();
+
+    return mangledName;
+}
+
+std::string NameMangler::CreateMangledNameForUnionProperty(const std::string &propTypeName)
+{
+    ES2PANDA_ASSERT(!propTypeName.empty());
+
+    std::string mangledName = "%%union_prop-";
+    mangledName += propTypeName;
+    std::replace(mangledName.begin(), mangledName.end(), '.', '_');
+
+    return mangledName;
+}
+
+std::string NameMangler::CreateMangledNameForAnnotation(const std::string &baseName, const std::string &annotationName)
+{
+    ES2PANDA_ASSERT(!baseName.empty() && !annotationName.empty());
+
+    std::string mangledName = "%%annotation-";
+    mangledName += annotationName;
+
+    return baseName + mangledName;
+}
+
+std::string NameMangler::AppendToAnnotationName(const std::string &annotationName, const std::string &secondPart)
+{
+    // Note (oeotvos) This ES2PANDA_ASSERT might be a bit too much here. Just create the name, or not?
+    ES2PANDA_ASSERT(annotationName.find("%%annotation") != 0);
+
+    return annotationName + "-" + secondPart;
+}
+}  // namespace ark::es2panda::util
diff --git a/ets2panda/util/nameMangler.h b/ets2panda/util/nameMangler.h
new file mode 100644
index 0000000000000000000000000000000000000000..ba26f90d6115d5ca6ea646f270da3de37ba059f6
--- /dev/null
+++ b/ets2panda/util/nameMangler.h
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef NAMEMANGLER_H
+#define NAMEMANGLER_H
+
+#include <string>
+#include "ustring.h"
+#include <mutex>
+
+namespace ark::es2panda::util {
+class NameMangler {
+public:
+    enum LangFeatureType {
+        ASYNC,
+        ENUM,
+        GET,
+        PARTIAL,
+        PROPERTY,
+        SET,
+    };
+
+    static NameMangler *GetInstance()
+    {
+        static NameMangler *manglerInstance;
+        if (manglerInstance == nullptr) {
+            manglerInstance = new NameMangler();
+        }
+
+        return manglerInstance;
+    };
+
+    std::string CreateMangledNameByTypeAndName(LangFeatureType type, const util::StringView &nodeName);
+    std::string CreateMangledNameForLambdaInvoke(size_t invokeCounter);
+    std::string CreateMangledNameForLambdaObject(const util::StringView &lambdaInvokeName);
+    std::string CreateMangledNameForUnionProperty(const std::string &propTypeName);
+    std::string CreateMangledNameForAnnotation(const std::string &baseName, const std::string &annotationName);
+    std::string AppendToAnnotationName(const std::string &annotationName, const std::string &secondPart);
+
+private:
+    NameMangler() = default;
+};
+}  // namespace ark::es2panda::util
+
+#endif  // NAMEMANGLER_H
diff --git a/ets2panda/varbinder/ETSBinder.cpp b/ets2panda/varbinder/ETSBinder.cpp
index ff783ab4364579225a9b8a5dc79ab89975be4002..21784b8977c2b5ac1d89e06327f1480b84efb12f 100644
--- a/ets2panda/varbinder/ETSBinder.cpp
+++ b/ets2panda/varbinder/ETSBinder.cpp
@@ -19,6 +19,7 @@
 #include "public/public.h"
 #include "compiler/lowering/util.h"
 #include "util/helpers.h"
+#include "util/nameMangler.h"
 
 namespace ark::es2panda::varbinder {
 
@@ -1285,12 +1286,18 @@ void ETSBinder::BuildFunctionName(const ir::ScriptFunction *func) const
     } else if (func->IsConstructor() && funcName.Is(compiler::Signatures::CONSTRUCTOR_NAME)) {
         ss << compiler::Signatures::CTOR;
     } else {
+        std::string newName;
         if (func->IsGetter()) {
-            ss << compiler::Signatures::GETTER_BEGIN;
+            newName = util::NameMangler::GetInstance()->CreateMangledNameByTypeAndName(
+                util::NameMangler::GET, util::Helpers::FunctionName(Allocator(), func));
+            ss << newName;
         } else if (func->IsSetter()) {
-            ss << compiler::Signatures::SETTER_BEGIN;
+            newName = util::NameMangler::GetInstance()->CreateMangledNameByTypeAndName(
+                util::NameMangler::SET, util::Helpers::FunctionName(Allocator(), func));
+            ss << newName;
+        } else {
+            ss << funcName;
         }
-        ss << funcName;
     }
 
     signature->ToAssemblerType(ss);