diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 0dbdf8c2e4..4dc3a91b2c 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -196,7 +196,7 @@ EAPI extern Elm_Version *elm_version;
 #include <elm_flip.h> // OK
 #include <elm_flipselector.h> // OK
 #include <elm_focus.h>  // OK
-#include <elm_fonts.h> // OK
+#include <elm_font.h> // OK
 #include <elm_frame.h> // OK
 #include <elm_gen.h> // OK
 #include <elm_gengrid.h> // OK
diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am
index 0915c00746..0d06909939 100644
--- a/legacy/elementary/src/lib/Makefile.am
+++ b/legacy/elementary/src/lib/Makefile.am
@@ -79,7 +79,7 @@ elm_finger.h \
 elm_flip.h \
 elm_flipselector.h \
 elm_focus.h \
-elm_fonts.h \
+elm_font.h \
 elm_frame.h \
 elm_gen.h \
 elm_general.h \
diff --git a/legacy/elementary/src/lib/elm_fonts.h b/legacy/elementary/src/lib/elm_font.h
similarity index 100%
rename from legacy/elementary/src/lib/elm_fonts.h
rename to legacy/elementary/src/lib/elm_font.h
diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c
index 6f7ce0ab0e..9a888249f2 100644
--- a/legacy/elementary/src/lib/elm_widget.c
+++ b/legacy/elementary/src/lib/elm_widget.c
@@ -1653,7 +1653,7 @@ elm_widget_focus_cycle(Evas_Object        *obj,
  *
  * @ingroup Widget
  */
-//XXX: If x, y indicates the elements of the directional vector,
+//FIXME: If x, y indicates the elements of the directional vector,
 //It would be better if these values are the normalized value(float x, float y)
 //or degree.
 EINA_DEPRECATED EAPI void