Renamed moa wrapper classes