Filename conventions.
Missed an include_once with all those file name changes
Merge pull request #3 from daniel-dgi/7.x

7.x