Change names to Kohana 3.3 format