Compatibility update for latest ZF 2.0 release

Some class names changed in the latest ZF 2.0 release. The PR will fix some issues.