VID-2050 modify bucky namespace