diff --git a/common/init.tf b/common/init.tf
index aedd023..2025957 100644
--- a/common/init.tf
+++ b/common/init.tf
@@ -11,3 +11,9 @@
 /eval /set kolor_info=%c_info
 /eval /set obecnie_swiat=%mudworld
 /eval /set obecnie_expujacy=%player
+/def _compat_clean = \
+  /quote -S -dexec !\
+  if [ -f %{priv_dir}/%{mudworld}/imiona.tf ]; then \
+    mv %{priv_dir}/%{mudworld}/imiona.tf %{priv_dir}/%{mudworld}/names.tf; \
+  fi
+/_compat_clean
diff --git a/common/people.tf b/common/people.tf
index 478837c..998cca0 100644
--- a/common/people.tf
+++ b/common/people.tf
@@ -11,22 +11,15 @@
 	/if ($(/list -s _imie_%{imiex})=~NULL) \
 		/echo -p #@{C%c_info}#@{n}# Zapamietany: @{C%c_info}%{imiex}@{n} %;\
 		/eval -s0 %{imie_def} %;\
-		/echo %{imie_def}%|/writefile -a %{priv_dir}/%{mudworld}/imiona.tf %;\
+		/echo %{imie_def}%|/writefile -a %{priv_dir}/%{mudworld}/names.tf %;\
 	/elseif /test (strstr("($(/list -s _imie_%{imiex}))","(%{imie_opis})((")==-1) %;/then \
 		/echo -p #@{C%c_info}#@{n}# Zmienil sie opis dla wpisu: @{C%c_info}%{imiex}@{n} %;\
 		/undef _imie_%{imiex} %;\
 		/eval -s0 %{imie_def} %;\
-		/echo /undef _imie_%{imiex}%|/writefile -a %{priv_dir}/%{mudworld}/imiona.tf %;\
-		/echo %{imie_def}%|/writefile -a %{priv_dir}/%{mudworld}/imiona.tf %;\
+		/echo /undef _imie_%{imiex}%|/writefile -a %{priv_dir}/%{mudworld}/names.tf %;\
+		/echo %{imie_def}%|/writefile -a %{priv_dir}/%{mudworld}/names.tf %;\
 	/endif
 
-/def czysc_imiona = \
-	/def -ag -h'REDEF' _redef_gag %;\
-	/load -q %{priv_dir}/%{mudworld}/imiona.tf %;\
-	/save %{priv_dir}/%{mudworld}/imiona.tf _imie_* %;\
-	/purge _redef_gag %;\
-	/ktoto licz
-
 /def ktoto = \
 	/if ({*}!~NULL) \
 		/if ({*} =~ "licz" ) \
diff --git a/common/start.tf b/common/start.tf
index 0f3918b..062fd14 100644
--- a/common/start.tf
+++ b/common/start.tf
@@ -49,10 +49,10 @@
   /load start.tf %;\
   /eval /cd %{main_dir}/%{mudworld} %;\
   /load start.tf %;\
-  /load %{priv_dir}/%{mudworld}/imiona.tf %;\
   /load %{priv_dir}/%{mudworld}/aliases.tf %;\
   /load %{priv_dir}/%{mudworld}/exceptions.tf %;\
   /load %{priv_dir}/%{mudworld}/herbs.tf %;\
+  /load %{priv_dir}/%{mudworld}/names.tf %;\
   /load %{priv_dir}/%{mudworld}/players/%{player}/%{player}.tf %;\
   /if ( {poczta_show} !~ "none" )\
     /status_edit -r1 poczta_show:5:C%{c_alarm} %;\
diff --git a/start.tf b/start.tf
index 6002c70..3c3fe28 100644
--- a/start.tf
+++ b/start.tf
@@ -14,10 +14,10 @@
     /eval /cd %%{main_dir}/$${world_name} %%;\
     /load sets.tf %%;\
     /load start.tf %%;\
-    /eval /load %%{priv_dir}/%%{mudworld}/imiona.tf %%;\
     /eval /load %%{priv_dir}/%%{mudworld}/aliases.tf %%;\
     /eval /load %%{priv_dir}/%%{mudworld}/exceptions.tf %%;\
     /eval /load %%{priv_dir}/%%{mudworld}/herbs.tf %%;\
+    /eval /load %%{priv_dir}/%%{mudworld}/names.tf %%;\
     /eval /load %%{priv_dir}/%%{mudworld}/players/%%{player}/%%{player}.tf
 
 /def -p20 -q -h'PROMPT *Podaj swoje imie*' nightal_login_hook0 = \
@@ -36,10 +36,10 @@
     /eval /cd %%{main_dir}/$${world_name} %%;\
     /load sets.tf %%;\
     /load start.tf %%;\
-    /eval /load %%{priv_dir}/%%{mudworld}/imiona.tf %%;\
     /eval /load %%{priv_dir}/%%{mudworld}/aliases.tf %%;\
     /eval /load %%{priv_dir}/%%{mudworld}/exceptions.tf %%;\
     /eval /load %%{priv_dir}/%%{mudworld}/herbs.tf %%;\
+    /eval /load %%{priv_dir}/%%{mudworld}/names.tf %%;\
     /eval /load %%{priv_dir}/%%{mudworld}/players/%%{player}/%%{player}.tf
 
 /def _dir_sprawdz = \
@@ -47,8 +47,8 @@
   if [ ! -d %{priv_dir}/%{mudworld} ]; then \
     mkdir -p %{priv_dir}/%{mudworld}; \
   fi; \
-  touch %{priv_dir}/%{mudworld}/imiona.tf; \
   touch %{priv_dir}/%{mudworld}/aliases.tf; \
+  touch %{priv_dir}/%{mudworld}/names.tf; \
   if [ ! -f %{priv_dir}/%{mudworld}/exceptions.tf ]; then \
     cp ../common/std/exceptions.tf %{priv_dir}/%{mudworld}/exceptions.tf; \
   fi; \