Fix build.

Some classes renames was missing.
Merge pull request #45 from MarianoGnu/master

Fix build.