Don't think we should need to suffix traits with Trait, it's usage is enough to know it's a trait really.