Adapting to new namespace