Update with Kohana v3.3 class names