Renamed factory to decorator