Renamed sound classes for clarity