#1080 namespace change