more fixes due to renaming of key classes