Rename traits to qualify suffix-wise