catch up more with core: namespace changes