Renamed the trait and methods according to the guidelines