Update for change in prefixes in the framework