Renamed NonQuery* to NonQueryStatement*