Renamed files to comply with Kohana v3.3 naming conventions