diff --git a/WordNetBul.gf b/WordNetBul.gf
index 8e7c7c729..6f8ee0634 100644
--- a/WordNetBul.gf
+++ b/WordNetBul.gf
@@ -110253,8 +110253,8 @@ lin versicle_N = variants {} ;
 lin versification_1_N = variants {mkN047 "версификация"; mkN072 "стихосложение"; mkN054 "стихотворство"} ; --guessed
 lin versification_2_N = mkN047 "версификация" ;
 lin versification_3_N = variants {mkN047 "версификация"; mkN072 "стихосложение"; mkN054 "стихотворство"} ; --guessed
-lin versifierMasc_N = mkN007a "поет" ; --guessed
-lin versifierFem_N = mkN041 "поетеса" ; --guessed
+lin versifierMasc_N = mkN008a "стихоплетец" ;
+lin versifierFem_N = mkN041 "стихоплетка" ;
 lin versify_V2 = variants {} ;
 lin version_1_N = mkN047 "версия" ;
 lin version_2_N = mkN047 "версия" ;
diff --git a/WordNetRus.gf b/WordNetRus.gf
index 59f9d4e36..188f5ca5e 100644
--- a/WordNetRus.gf
+++ b/WordNetRus.gf
@@ -84155,10 +84155,10 @@ lin rhyme_2_N = mkN "рифма" feminine inanimate "1a" (mkA "рифмован
 lin rhyme_1_V = mkV imperfective intransitive "рифмовать" ; --guessed
 lin rhyme_2_V = variants {} ;
 lin rhyme_1_V2 = mkV2 (mkV imperfective intransitive "рифмовать") ; --guessed
-lin rhymerMasc_N = mkN "рифмач" masculine animate "4b" ; --guessed
-lin rhymerFem_N = mkN "рифмач" masculine animate "4b" ; --guessed
-lin rhymesterMasc_N = mkN "поэт" ; --guessed
-lin rhymesterFem_N = mkN "поэтесса" feminine animate "1a" (mkA "поэтичный") ; --guessed
+lin rhymerMasc_N = mkN "рифмач" masculine animate "4b" ;
+lin rhymerFem_N = mkN "рифмачка" ;
+lin rhymesterMasc_N = mkN "рифмач" masculine animate "4b" ;
+lin rhymesterFem_N = mkN "рифмачка" ;
 lin rhymney_LN = mkLN "Римни" ;
 lin rhyolite_N = mkN "риолит" masculine inanimate "1a" ; --guessed
 lin rhythm_1_N = mkN "ритм" masculine inanimate "1a" (mkA "ритмичный") ; --guessed
@@ -109985,7 +109985,7 @@ lin versicle_N = variants {} ;
 lin versification_1_N = mkN "просодия" feminine inanimate "7a" (mkA "просодический") ; --guessed
 lin versification_2_N = mkN "ритм" masculine inanimate "1a" (mkA "ритмичный") ; --guessed
 lin versification_3_N = mkN "просодия" feminine inanimate "7a" (mkA "просодический") ; --guessed
-lin versifierMasc_N = mkN "поет" ; --guessed
+lin versifierMasc_N = mkN "рифмач" masculine animate "4b" ;
 lin versifierFem_N = mkN "поет" ; --guessed
 lin versify_V2 = mkV2 (compoundV (mkV imperfective transitive "писать" "пишу" "пишет" "6c") "стихи") ; --guessed
 lin version_1_N = mkN "версия" feminine inanimate "7a" ; --guessed