catch up with core: namespace changes