Solving the issue #82 - CI 2.x old class/file naming convention.

This was tested on a master-branch copy.