diff --git a/uAffixes.pas b/uAffixes.pas
index b4a2780b..3e3d4874 100644
--- a/uAffixes.pas
+++ b/uAffixes.pas
@@ -585,8 +585,7 @@ constructor TAffixes.Create();
 begin
   P := TypeInfo(TSuffixEnum);
   for I := Low(TSuffixEnum) to High(TSuffixEnum) do
-    FSuffixName[I] := StringReplace(GetEnumName(P, Ord(I)), '_', ' ',
-      [rfReplaceAll]);
+    FSuffixName[I] := GetEnumName(P, Ord(I)).GetName('');
 end;
 
 procedure TAffixes.DoCraft(const Effect: TEffect; const Index: UInt);
diff --git a/uHelpers.pas b/uHelpers.pas
index ba31938d..4744bb69 100644
--- a/uHelpers.pas
+++ b/uHelpers.pas
@@ -92,7 +92,8 @@ function TItemHelper.DoIt: string;
 
 function TStringHelper.GetName(const Pref: string): string;
 begin
-  Result := StringReplace(Self, Pref, '', [rfReplaceAll]);
+  if (Pref <> '') then
+    Result := StringReplace(Self, Pref, '', [rfReplaceAll]);
   Result := StringReplace(Result, '_', ' ', [rfReplaceAll]);
 end;
 
diff --git a/uScenes.pas b/uScenes.pas
index 81e5fb96..dd98db0f 100644
--- a/uScenes.pas
+++ b/uScenes.pas
@@ -573,11 +573,10 @@ procedure TSceneHelp.Render;
       begin
         UI.Title(_('Keybindings'), 5);
 
-        Terminal.Print(CX, 6, Format('%s: %s, %s, %s', [_('Scroll pages and skills'), UI.KeyToStr('arrow keys'),
-          UI.KeyToStr('numpad'), UI.KeyToStr('WADX')]), TK_ALIGN_CENTER);
-
         X := 1;
         Y := 8;
+        AddLine('Right/Left', _('Change tab'));
+        AddLine('Up/Down', _('Scroll skills'));
         AddLine('Tab', _('Show Background'));
         AddLine('Space', _('Show Inventory'));
       end;
@@ -1811,10 +1810,11 @@ procedure TSceneRest.Update(var Key: UInt);
 
 procedure TSceneName.Render;
 begin
-  UI.Title(_('Name'));
+  UI.Title(_('Choose name'));
 
-  Terminal.Print(CX - 10, CY, _('Name') + ': ' + Player.Name + Game.GetCursor, TK_ALIGN_LEFT);
+  Terminal.Print(CX - 10, CY, _('Enter you name') + ': ' + Player.Name + Game.GetCursor, TK_ALIGN_LEFT);
 
+  AddKey('Enter', _('Confirm'));
   AddKey('Esc', _('Back'), True);
 end;