Rename build tagged things to make more sense