diff --git a/RecodeItLib/Remapper/ReCodeItRemapper.cs b/RecodeItLib/Remapper/ReCodeItRemapper.cs
index 13c41a5..05a2344 100644
--- a/RecodeItLib/Remapper/ReCodeItRemapper.cs
+++ b/RecodeItLib/Remapper/ReCodeItRemapper.cs
@@ -135,15 +135,17 @@ public class ReCodeItRemapper
 
         var tokens = DataProvider.Settings.AutoMapper.TokensToMatch;
 
-        if (tokens.Where(token => !tokens.Any(token => type.Name.StartsWith(token))).Any())
+        bool ignore = tokens
+            .Where(token => !tokens
+                .Any(token => type.Name.StartsWith(token))).Any();
+
+        if (ignore && remap.SearchParams.IsNested is null)
         {
             return;
         }
 
         foreach (var nestedType in type.NestedTypes)
         {
-            if (remap.SearchParams.IsNested is false) { return; }
-
             FindMatch(nestedType, remap);
         }
 
@@ -188,8 +190,8 @@ public class ReCodeItRemapper
         if (match)
         {
             // Set the original type name to be used later
-            score.ReMap.OriginalTypeName = type.Name;
-            remap.OriginalTypeName = type.Name;
+            score.ReMap.OriginalTypeName = type.FullName;
+            remap.OriginalTypeName = type.FullName;
             remap.Succeeded = true;
             remap.FailureReason = EFailureReason.None;
             score.AddScoreToResult();
@@ -271,7 +273,7 @@ public class ReCodeItRemapper
         if (highestScore is null) { return; }
 
         Logger.Log("-----------------------------------------------", ConsoleColor.Green);
-        Logger.Log($"Renaming {highestScore.Definition.Name} to {highestScore.ProposedNewName}", ConsoleColor.Green);
+        Logger.Log($"Renaming {highestScore.Definition.FullName} to {highestScore.ProposedNewName}", ConsoleColor.Green);
         Logger.Log($"Scored: {highestScore.Score} points", ConsoleColor.Green);
 
         if (filteredScores.Count() > 1 && filteredScores.Skip(1).Any(score => score.Score == highestScore.Score))
@@ -284,7 +286,7 @@ public class ReCodeItRemapper
             }
         }
 
-        // highestScore.ReMap.OriginalTypeName = highestScore.Definition.Name;
+        highestScore.ReMap.OriginalTypeName = highestScore.Definition.Name;
 
         if (CrossMapMode)
         {// Store the original types for caching
diff --git a/RecodeItLib/Remapper/RenameHelper.cs b/RecodeItLib/Remapper/RenameHelper.cs
index 4b58c5d..77b8b99 100644
--- a/RecodeItLib/Remapper/RenameHelper.cs
+++ b/RecodeItLib/Remapper/RenameHelper.cs
@@ -166,7 +166,13 @@ internal static class RenameHelper
                 RenameType(type.NestedTypes, score);
             }
 
-            if (score.Definition.Name == null) { continue; }
+            if (score.Definition.Name is null) { continue; }
+
+            if (score.ReMap.SearchParams.IsNested is true &&
+                type.IsNested && type.Name == score.Definition.Name)
+            {
+                type.Name = score.ProposedNewName;
+            }
 
             if (type.FullName == score.Definition.Name)
             {
diff --git a/RecodeItLib/Remapper/Search/TypeDefExtensions.cs b/RecodeItLib/Remapper/Search/TypeDefExtensions.cs
index aee5623..5df1c80 100644
--- a/RecodeItLib/Remapper/Search/TypeDefExtensions.cs
+++ b/RecodeItLib/Remapper/Search/TypeDefExtensions.cs
@@ -55,6 +55,16 @@ internal static class TypeDefExtensions
             return EMatchResult.Disabled;
         }
 
+        if (parms.ParentName is not null)
+        {
+            if (type.Name == parms.ParentName)
+            {
+                Logger.Log($"Match! {type.Name} : {score.ProposedNewName}");
+                score.Score++;
+                return EMatchResult.Match;
+            }
+        }
+
         if (type.IsNested == parms.IsNested)
         {
             score.Score++;