Renamed to generic Yamaha name