Fix style with new namespace