Change controller names

Using `Controller` instead of `Ctrl`.