diff --git a/gst/gstelementfactory.c b/gst/gstelementfactory.c
index 19f793120c..3b08b97cf4 100644
--- a/gst/gstelementfactory.c
+++ b/gst/gstelementfactory.c
@@ -101,7 +101,7 @@ gst_element_factory_init (GstElementFactory *factory)
  * gst_element_factory_find:
  * @name: name of factory to find
  *
- * Search for an elementfactory of the given name.
+ * Search for an element factory of the given name.
  *
  * Returns: #GstElementFactory if found, NULL otherwise
  */
@@ -129,7 +129,7 @@ gst_element_factory_find (const gchar *name)
 /**
  * gst_element_factory_get_list:
  *
- * Get the global list of elementfactories.
+ * Get the global list of element factories.
  *
  * Returns: GList of type #GstElementFactory
  */
diff --git a/gst/gstregistry.h b/gst/gstregistry.h
index f8fcccaf29..fc876d6438 100644
--- a/gst/gstregistry.h
+++ b/gst/gstregistry.h
@@ -25,12 +25,12 @@
 #define __GST_REGISTRY_H__
 
 #define GLOBAL_REGISTRY_DIR      GST_CONFIG_DIR
-#define GLOBAL_REGISTRY_FILE     GLOBAL_REGISTRY_DIR"/reg.xml"
-#define GLOBAL_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.reg.xml.tmp"
+#define GLOBAL_REGISTRY_FILE     GLOBAL_REGISTRY_DIR"/registry.xml"
+#define GLOBAL_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry.xml.tmp"
 
 #define LOCAL_REGISTRY_DIR       ".gstreamer"
-#define LOCAL_REGISTRY_FILE      LOCAL_REGISTRY_DIR"/reg.xml"
-#define LOCAL_REGISTRY_FILE_TMP  LOCAL_REGISTRY_DIR"/.reg.xml.tmp"
+#define LOCAL_REGISTRY_FILE      LOCAL_REGISTRY_DIR"/registry.xml"
+#define LOCAL_REGISTRY_FILE_TMP  LOCAL_REGISTRY_DIR"/.registry.xml.tmp"
 
 #define REGISTRY_DIR_PERMS (S_ISGID | \
                             S_IRUSR | S_IWUSR | S_IXUSR | \