Remove unnecessary 'tb-' prefix