Rename traits from common