BS-8923, update labels and descriptions