diff --git a/src/icelandic/LexiconIce.gf b/src/icelandic/LexiconIce.gf
index 2b052acc2..a628434c6 100644
--- a/src/icelandic/LexiconIce.gf
+++ b/src/icelandic/LexiconIce.gf
@@ -1,7 +1,7 @@
 --# -path=.:prelude
 
 concrete LexiconIce of Lexicon = CatIce **
-  open ParadigmsIce, IrregIce, Prelude in {
+  open ParadigmsIce, (I=WiktIrregIce), Prelude in {
 
 	lin
 		bank_N = mkN "banki" masculine ;
@@ -254,7 +254,7 @@ concrete LexiconIce of Lexicon = CatIce **
 		-- Old paradigms
 		already_Adv = mkAdv "þegar" ;
 		far_Adv = mkAdv "langt" ;
-		fly_V = IrregIce.fljúga_V ;
+		fly_V = I.fljúga_V ;
 		john_PN = mkPN "Jón" masculine ;
 
 		now_Adv = mkAdv "núna" ;
@@ -304,56 +304,56 @@ concrete LexiconIce of Lexicon = CatIce **
 		throw_V2 = mkV2 (mkV "kasta" "kasta" "kastaði" "kastaður") ;
 
 		turn_V = mkV "beygja" "beygi" ;
-		bite_V2 = mkV2 IrregIce.bíta_V ;
-		break_V2 = mkV2 IrregIce.brjóta_V ;
-		wait_V2 = mkV2 (IrregIce.bíða_V) (mkPrep "eftir" dative) ;
-		wash_V2 = mkV2 IrregIce.þrífa_V ;
-		suck_V2 = mkV2 IrregIce.sjúga_V ;
-		wipe_V2 = mkV2 IrregIce.strjúka_V ;
-		lie_V = IrregIce.ljúga_V ;
-		freeze_V = IrregIce.frjósa_V ;
-		float_V = IrregIce.fljóta_V ;
+		bite_V2 = mkV2 I.bíta_V ;
+		break_V2 = mkV2 I.brjóta_V ;
+		wait_V2 = mkV2 (I.bíða_V) (mkPrep "eftir" dative) ;
+		wash_V2 = mkV2 I.þrífa_V ;
+		suck_V2 = mkV2 I.sjúga_V ;
+		wipe_V2 = mkV2 I.strjúka_V ;
+		lie_V = I.ljúga_V ;
+		freeze_V = I.frjósa_V ;
+		float_V = I.fljóta_V ;
 		flow_V = mkV "flæða" ;
-		go_V = IrregIce.fara_V ;
-		leave_V2 = mkV2 IrregIce.fara_V ;
+		go_V = I.fara_V ;
+		leave_V2 = mkV2 I.fara_V ;
 		seek_V2 = mkV2 (mkV "leita" "leita" "leitaði" "leitaður") ;
 		travel_V = mkV "ferða" "ferða" "ferðaði" "ferðaður" ; -- this verb only exists in the middle voice
-		know_V2 = mkV2 IrregIce.vita_V ;
-		know_VQ = IrregIce.vita_V ;
-		know_VS = IrregIce.vita_V ;
+		know_V2 = mkV2 I.vita_V ;
+		know_VQ = I.vita_V ;
+		know_VS = I.vita_V ;
 		ask_V2Q = mkV2 (mkV "spyrja" "spyr" "spurði" "spurður") (mkPrep "" accusative) ;
-		find_V2 = mkV2 IrregIce.finna_V ;
-		win_V2 = mkV2 IrregIce.vinna_V ;
-		fall_V = IrregIce.detta_V ;
-		burn_V = IrregIce.brenna_V ;
-		drink_V2 = mkV2 IrregIce.drekka_V ;
+		find_V2 = mkV2 I.finna_V ;
+		win_V2 = mkV2 I.vinna_V ;
+		fall_V = I.detta_V ;
+		burn_V = I.brenna_V ;
+		drink_V2 = mkV2 I.drekka_V ;
 		add_V3 = mkV3 (mkV "bæta" "bæti" "bætti" "bættur") (mkPrep "" dative) (mkPrep "við" accusative) ;
-		beg_V2V = mkV3 IrregIce.biðja_V (mkPrep "" accusative) (mkPrep "um að" accusative) ;
-		read_V2 = mkV2 IrregIce.lesa_V ;
-		kill_V2 = mkV2 IrregIce.drepa_V ;
-		give_V3 = mkV3 IrregIce.gefa_V ;
-		sit_V = IrregIce.sitja_V ;
+		beg_V2V = mkV3 I.biðja_V (mkPrep "" accusative) (mkPrep "um að" accusative) ;
+		read_V2 = mkV2 I.lesa_V ;
+		kill_V2 = mkV2 I.drepa_V ;
+		give_V3 = mkV3 I.gefa_V ;
+		sit_V = I.sitja_V ;
 		hope_VS = mkV "vona" "vona" "vonaði" "vonaður" ;
 		wonder_VQ = mkV "velta" ;
-		play_V2 = mkV2 IrregIce.leika_V ;
-		laugh_V = IrregIce.hlæja_V ;
-		hold_V2 = mkV2 IrregIce.halda_V ;
-		die_V = IrregIce.deyja_V ;
-		run_V = IrregIce.hlaupa_V ;
-		walk_V = IrregIce.ganga_V ;
-		dig_V = IrregIce.grafa_V ;
-		see_V2 = mkV2 IrregIce.sjá_V ;
-		blow_V = IrregIce.blása_V ;
-		sleep_V = IrregIce.sofa_V ;
-		put_V2 = mkV2 IrregIce.láta_V ;
+		play_V2 = mkV2 I.leika_V ;
+		laugh_V = I.hlæja_V ;
+		hold_V2 = mkV2 I.halda_V ;
+		die_V = I.deyja_V ;
+		run_V = I.hlaupa_V ;
+		walk_V = I.ganga_V ;
+		dig_V = I.grafa_V ;
+		see_V2 = mkV2 I.sjá_V ;
+		blow_V = I.blása_V ;
+		sleep_V = I.sofa_V ;
+		put_V2 = mkV2 I.láta_V ;
 		buy_V2 = mkV2 (mkV "kaupa" "kaupi" "keypti" "keyptur" "keypt") ;
-		tie_V2 = mkV2 IrregIce.binda_V ;
-		stab_V2 = mkV2 IrregIce.stinga_V ;
-		come_V = IrregIce.koma_V ;
-		play_V = IrregIce.leika_V ;
-		sing_V = IrregIce.syngja_V ;
-		stand_V = IrregIce.standa_V ;
-		become_VA = IrregIce.verða_V ;
+		tie_V2 = mkV2 I.binda_V ;
+		stab_V2 = mkV2 I.stinga_V ;
+		come_V = I.koma_V ;
+		play_V = I.leika_V ;
+		sing_V = I.syngja_V ;
+		stand_V = I.standa_V ;
+		become_VA = I.verða_V ;
 		talk_V3 = mkV3 (mkV "tala" "tala" "talaði" "talaður") (mkPrep "við" accusative) (mkPrep "um" accusative) ;
 		send_V3 = mkV3 (mkV "senda") (mkPrep "" accusative) (mkPrep "með" accusative) ;
 		say_VS = mkV "segja" "segi" "sagði" "sagður";