Renamed decorator classes to be clearer