Renaming to follow renaming of the framework