Title clean up

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>
Rename controllers to be a tad more logical and consistent

Signed-off-by: Gawain Lynch <gawain.lynch@gmail.com>