renamming classes to be compatible with kohana 3.3