1 files changed, 12 insertions, 9 deletions
diff --git a/acf/model/field.lua b/acf/model/field.lua
index 8927dfd..a186064 100644
--- a/acf/model/field.lua
+++ b/acf/model/field.lua
@@ -22,13 +22,6 @@ local function contains(list, value)
    return false
 end
 
-local function auto_ui_name(name)
-   if not name then return end
-   return string.gsub(string.upper(string.sub(name, 1, 1))..string.sub(name, 2),
-		      '_', ' ')
-end
-
-
 Member = class()
 
 function Member:init(params)
@@ -37,11 +30,18 @@ function Member:init(params)
    end
 end
 
+function Member:auto_ui_name(name)
+   if not name then return end
+   return string.gsub(
+      string.upper(string.sub(name, 1, 1))..string.sub(name, 2), '-', ' '
+   )
+end
+
 function Member:meta(context)
    return {
       name=self.name,
       description=self.description,
-      ['ui-name']=self['ui-name'] or auto_ui_name(self.name)
+      ['ui-name']=self.ui_name or self:auto_ui_name(self.name)
    }
 end
 
@@ -52,7 +52,10 @@ function Field:init(params)
    super(self, Field):init(params)
 
    if self.choice and not self['ui-choice'] then
-      self['ui-choice'] = map(auto_ui_name, self.choice)
+      self['ui-choice'] = map(
+	 function(name) return self:auto_ui_name(name) end,
+	 self.choice
+      )
    end
 
    if not self.widget then