diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c
index 7e7d45e1caf..f9e630d9178 100644
--- a/programs/winecfg/winecfg.c
+++ b/programs/winecfg/winecfg.c
@@ -71,7 +71,7 @@ void set_window_title(HWND dialog)
 
 
 /**
- * getkey: Retrieves a configuration value from the registry
+ * get_config_key: Retrieves a configuration value from the registry
  *
  * char *subkey : the name of the config section
  * char *name : the name of the config value
@@ -81,7 +81,7 @@ void set_window_title(HWND dialog)
  * not. Caller is responsible for releasing the result.
  *
  */
-static char *getkey (char *subkey, char *name, char *def)
+static char *get_config_key (char *subkey, char *name, char *def)
 {
     LPBYTE buffer = NULL;
     DWORD len;
@@ -129,7 +129,7 @@ end:
 }
 
 /**
- * setkey: convenience wrapper to set a key/value pair
+ * set_config_key: convenience wrapper to set a key/value pair
  *
  * const char *subKey : the name of the config section
  * const char *valueName : the name of the config value
@@ -139,7 +139,7 @@ end:
  *
  * If valueName or value is NULL, an empty section will be created
  */
-int setkey(const char *subkey, const char *name, const char *value) {
+int set_config_key(const char *subkey, const char *name, const char *value) {
     DWORD res = 1;
     HKEY key = NULL;
 
@@ -258,7 +258,7 @@ char *get(char *path, char *name, char *def)
     }
 
     /* no, so get from the registry */
-    val = getkey(path, name, def);
+    val = get_config_key(path, name, def);
 
     WINE_TRACE("returning %s\n", val);
 
@@ -445,7 +445,7 @@ static void process_setting(struct setting *s)
     if (s->value)
     {
 	WINE_TRACE("Setting %s:%s to '%s'\n", s->path, s->name, s->value);
-        setkey(s->path, s->name, s->value);
+        set_config_key(s->path, s->name, s->value);
     }
     else
     {