Fixed some naming issues (Result->Row and Resultset->ResultSet)