Fix build.

Some classes renames was missing.