Renamed ambiguous Notes classes