Naming convention fixes to Controller. Bugfix to Cookies.