diff --git a/ChangeLog b/ChangeLog
index 525ee56d3..a363e60ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Correct module naming.
+
+	* video/efi_uga.c (GRUB_MOD_INIT(efi_fb)): Renamed from this ...
+	(GRUB_MOD_INIT(efi_uga)): ... to this
+	(GRUB_MOD_FINI(efi_fb)): Renamed from this ...
+	(GRUB_MOD_FINI(efi_uga)): ... to this
+	* video/efi_gop.c (GRUB_MOD_INIT(efi_fb)): Renamed from this ...
+	(GRUB_MOD_INIT(efi_gop)): ... to this
+	(GRUB_MOD_FINI(efi_fb)): Renamed from this ...
+	(GRUB_MOD_FINI(efi_gop)): ... to this
+
 2009-11-28  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* util/mkisofs/mkisofs.c (ld_options): Mark all `arg' strings as
diff --git a/video/efi_gop.c b/video/efi_gop.c
index 4cbcaba8d..e2eb2f7ae 100644
--- a/video/efi_gop.c
+++ b/video/efi_gop.c
@@ -380,13 +380,13 @@ static struct grub_video_adapter grub_video_gop_adapter =
     .next = 0
   };
 
-GRUB_MOD_INIT(efi_fb)
+GRUB_MOD_INIT(efi_gop)
 {
   if (check_protocol ())
     grub_video_register (&grub_video_gop_adapter);
 }
 
-GRUB_MOD_FINI(efi_fb)
+GRUB_MOD_FINI(efi_gop)
 {
   if (restore_needed)
     {
diff --git a/video/efi_uga.c b/video/efi_uga.c
index b5f3e62f2..31062c5f5 100644
--- a/video/efi_uga.c
+++ b/video/efi_uga.c
@@ -324,13 +324,13 @@ static struct grub_video_adapter grub_video_uga_adapter =
     .get_active_render_target = grub_video_fb_get_active_render_target,
   };
 
-GRUB_MOD_INIT(efi_fb)
+GRUB_MOD_INIT(efi_uga)
 {
   if (check_protocol ())
     grub_video_register (&grub_video_uga_adapter);
 }
 
-GRUB_MOD_FINI(efi_fb)
+GRUB_MOD_FINI(efi_uga)
 {
   if (uga)
     grub_video_unregister (&grub_video_uga_adapter);