   (interactive (list 'interactive))
   (cl-case command
     (interactive (company-begin-backend 'company-ycmd-backend))
-    (prefix      (company-ycmd-get-prefix))
-    (candidates  (company-ycmd-get-candidates arg))
-    (meta        (company-ycmd-get-metadata arg))
-    (annotation  (company-ycmd-get-annotation arg))
-    (match       (company-ycmd-get-match arg))
+    (prefix      (company-ycmd--prefix))
+    (candidates  (company-ycmd--candidates arg))
+    (meta        (company-ycmd--meta arg))
+    (annotation  (company-ycmd--annotation arg))
+    (match       (company-ycmd--match arg))
     (no-cache    't) ; Don't cache. It interferes with fuzzy matching.
-    )) 
+    ))
 
 (defun company-ycmd-enable-comprehensive-automatic-completion ()
   "This updates company-begin-commands so that automatic

    (dolist (prop company-ycmd-completion-properties candidate)
      (put-text-property 0 1 prop (assoc-default prop src) candidate))))

(defun company-ycmd-candidates (cb)
  "Get list of completion candidate strings at point.

The returned strings have annotation, metadata, and other pieces

(defcustom company-ycmd-modes '(c++-mode python-mode csharp-mode)
  "The list of modes for which company-ycmd will attempt completions.")

(defun company-ycmd--construct-candidate (src)
  "Converts a ycmd completion structure to a candidate string.

Takes a ycmd completion structure SRC, extracts the
