diff --git a/legacy/edje/README b/legacy/edje/README
index e40cd1b7fc..66b35ecbac 100644
--- a/legacy/edje/README
+++ b/legacy/edje/README
@@ -55,22 +55,22 @@ Quick start-up guide:
    make
    sudo make install
 
-You now want to go test it out. first you'll need to make an edje .eet file.
+You now want to go test it out. first you'll need to make an edje EET file.
    
    cd data
    ./e_logo.sh
    
 Now you can view the edje you just built:
    
-   edje ./e_logo.eet
+   edje ./e_logo.edj
    
 You can view multilpe files at once with the edje test program:
    
-   edje ./e_logo.eet ./e_logo.eet ./e_logo.eet
+   edje ./e_logo.edj ./e_logo.edj ./e_logo.edj
    
 to view the same one 3 times.
    
-You can read the source fuile that builds the edje .eet file by looking at:
+You can read the source fuile that builds the edje EET file by looking at:
 
    data/src/e_logo.edc
 
diff --git a/legacy/edje/data/e_logo.sh b/legacy/edje/data/e_logo.sh
index d8f2f121c7..6d44517179 100755
--- a/legacy/edje/data/e_logo.sh
+++ b/legacy/edje/data/e_logo.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec edje_cc -v -fd ./test/fonts -id ./images src/e_logo.edc e_logo.eet 
+exec edje_cc -v -fd ./test/fonts -id ./images src/e_logo.edc e_logo.edj
diff --git a/legacy/edje/data/template/build_theme.sh b/legacy/edje/data/template/build_theme.sh
index e77e218b77..637f2178ec 100755
--- a/legacy/edje/data/template/build_theme.sh
+++ b/legacy/edje/data/template/build_theme.sh
@@ -1,13 +1,13 @@
 #!/bin/sh -e
 THEME="default"
 APPNAME=""
-edje_cc -v -id ./images -fd ./fonts $THEME.edc $THEME.eet
+edje_cc -v -id ./images -fd ./fonts $THEME.edc $THEME.edj
 if [ $? = "0" ]; then
     if [ "$APPNAME" = "" ]; then
 	echo "Build was successful"
     else
 	PREFIX=`dirname \`which $APPNAME\` | sed 's/bin//'`
-	sudo cp $THEME.eet $PREFIX"share/$APPNAME/themes/"
+	sudo cp $THEME.edj $PREFIX"share/$APPNAME/themes/"
 	echo -n "Installed theme to "
 	echo $PREFIX"share/$APPNAME/themes/"
     fi
diff --git a/legacy/edje/src/bin/edje_cc.c b/legacy/edje/src/bin/edje_cc.c
index 966590efe3..6c658290cc 100644
--- a/legacy/edje/src/bin/edje_cc.c
+++ b/legacy/edje/src/bin/edje_cc.c
@@ -28,7 +28,7 @@ main_help(void)
 {
    printf
      ("Usage:\n"
-      "\t%s [OPTIONS] input_file.edc [output_file.eet]\n"
+      "\t%s [OPTIONS] input_file.edc [output_file.edj]\n"
       "\n"
       "Where OPTIONS is one or more of:\n"
       "\n"
@@ -168,7 +168,7 @@ main(int argc, char **argv)
                if (file_out)
                   {
                      suffix = strstr(file_out,".edc");
-                     strcpy(suffix,".eet");
+                     strcpy(suffix,".edj");
                   }
             }
       }
diff --git a/legacy/edje/src/bin/edje_decc.c b/legacy/edje/src/bin/edje_decc.c
index f559e69433..7c366ad952 100644
--- a/legacy/edje/src/bin/edje_decc.c
+++ b/legacy/edje/src/bin/edje_decc.c
@@ -31,7 +31,7 @@ main_help(void)
 {
    printf
      ("Usage:\n"
-      "\t%s input_file.eet \n"
+      "\t%s input_file.edj \n"
       "\n"
       ,progname);
 }
@@ -282,7 +282,7 @@ output(void)
 	  }
 	f = fopen(out, "w");
 	fprintf(f, "#!/bin/sh\n");
-	fprintf(f, "%s $@ --image_dir . --font_dir . %s -o %s.eet\n", edje_file->compiler, sf->name, outdir);
+	fprintf(f, "%s $@ --image_dir . --font_dir . %s -o %s.edj\n", edje_file->compiler, sf->name, outdir);
 	fclose(f);
 
 #ifndef WIN32
diff --git a/legacy/edje/src/bin/edje_ls.c b/legacy/edje/src/bin/edje_ls.c
index 7024057f27..472c5fe045 100644
--- a/legacy/edje/src/bin/edje_ls.c
+++ b/legacy/edje/src/bin/edje_ls.c
@@ -11,7 +11,7 @@ static void
 main_help(void)
 {
    printf("Usage: "
-      "%s [OPTIONS] input_file.eet ...\n"
+      "%s [OPTIONS] input_file.edj ...\n"
       "\t-o outfile.txt    Output the listing of the collections to a file\n"
       , progname);
 }
diff --git a/legacy/edje/src/bin/edje_main.c b/legacy/edje/src/bin/edje_main.c
index a90c3f9096..7592f28117 100644
--- a/legacy/edje/src/bin/edje_main.c
+++ b/legacy/edje/src/bin/edje_main.c
@@ -826,9 +826,9 @@ main(int argc, char **argv)
 	printf("  %s [-gl] [-fb] [-g WxH] [-fill] [edje_file1] [edje_file2] ...\n", argv[0]);
 	printf("\n");
 	printf("Example:\n");
-	printf("  %s data/e_logo.eet\n", argv[0]);
-	printf("  %s -fill -g 800x600 data/e_logo.eet\n", argv[0]);
-	printf("  %s -gl -fill -g 800x600 data/e_logo.eet\n", argv[0]);
+	printf("  %s data/e_logo.edj\n", argv[0]);
+	printf("  %s -fill -g 800x600 data/e_logo.edj\n", argv[0]);
+	printf("  %s -gl -fill -g 800x600 data/e_logo.edj\n", argv[0]);
 	exit(-1);
      }
    for (i = 1; i < argc; i++)
diff --git a/legacy/edje/src/bin/edje_recc b/legacy/edje/src/bin/edje_recc
index 07691a8b26..da80d98136 100644
--- a/legacy/edje/src/bin/edje_recc
+++ b/legacy/edje/src/bin/edje_recc
@@ -4,7 +4,7 @@ set -e
 
 usage () {
   echo "Usage:"
-  echo "        edje_recc [OPTIONS] input_file.eet"
+  echo "        edje_recc [OPTIONS] input_file.edj"
   echo ""
   echo "Where OPTIONS is one or more of:"
   echo ""
@@ -37,7 +37,7 @@ if [ $# -ge 1 ]; then
         usage
       ;;
       
-      *.eet)
+      *.edj)
         IN=$I
       ;;
       
@@ -49,13 +49,13 @@ if [ $# -ge 1 ]; then
 fi
 
 if [ -z "$IN" ]; then
-  echo "ERROR: NO input file.eet provided!"
+  echo "ERROR: NO input file.edj provided!"
   echo ""
   usage;
 fi
 
 F=`basename $IN`
-B=`basename $F .eet`
+B=`basename $F .edj`
 T="./...edje_tmp"
 rm -rf $T
 mkdir -p $T
diff --git a/legacy/edje/src/bin/edje_test_main.c b/legacy/edje/src/bin/edje_test_main.c
index 91806daa32..ab163e48d0 100644
--- a/legacy/edje/src/bin/edje_test_main.c
+++ b/legacy/edje/src/bin/edje_test_main.c
@@ -293,7 +293,7 @@ main(int argc, char **argv)
    
    if (argc != 3)
      {
-	printf("Usage: eddje_test edje_file.eet part_to_load\n");
+	printf("Usage: eddje_test edje_file.edj part_to_load\n");
 	exit(-1);
      }
    
diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index 36c62b200e..6dacef3cd2 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -15,14 +15,14 @@ static int  _edje_collection_free_prog_cache_matches_free_cb(Evas_Hash *hash, co
 /************************** API Routines **************************/
 
 /* FIXDOC: Verify/expand doc */
-/** Sets the .eet file to be used
+/** Sets the EET file to be used
  * @param obj A valid Evas_Object handle
- * @param file The path to the .eet file
- * @param part The group name in the eet
+ * @param file The path to the EET file
+ * @param part The group name in the Edje
  * @return 0 on Error\n
  * 1 on Success and sets EDJE_LOAD_ERROR_NONE
  *
- * This loads the .eet file and sets up the Edje.
+ * This loads the EET file and sets up the Edje.
  */
 int
 edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
@@ -285,12 +285,12 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *part)
 }
 
 /* FIXDOC: Verify/expand doc. */
-/** Get the .eet location and group for the Evas Object. ?! Assuming eet file
+/** Get the EET location and group for the Evas Object. ?! Assuming eet file
  * @param obj A valid Evas_Object handle
- * @param file The .eet file location pointer
- * @param part The eet part pointer
+ * @param file The EET file location pointer
+ * @param part The EET part pointer
  *
- * This gets the .eet file location and group for the given Evas_Object.
+ * This gets the EET file location and group for the given Evas_Object.
  */
 void
 edje_object_file_get(Evas_Object *obj, const char **file, const char **part)