Minor tweeks to Controllers and names.