update labels and naming