Renaming file to match Kohana 3.3 nomenclature.

A tiny reorganisation, for 3.3 compatibility.