--- a/core/moduleapi.lua	Mon Dec 30 09:53:10 2019 +0100
+++ b/core/moduleapi.lua	Mon Dec 30 09:54:49 2019 +0100
@@ -15,7 +15,7 @@
 local resolve_relative_path = require"util.paths".resolve_relative_path;
 local st = require "util.stanza";
 local cache = require "util.cache";
-local errutil = require "util.error";
+local errors = require "util.error";
 local promise = require "util.promise";
 local time_now = require "util.time".now;
 local format = require "util.format".format;
@@ -370,7 +370,7 @@
 	local iq_cache = self._iq_cache;
 	if not iq_cache then
 		iq_cache = cache.new(256, function (_, iq)
-			iq.reject(errutil.new({
+			iq.reject(errors.new({
 				type = "wait", condition = "resource-constraint",
 				text = "evicted from iq tracking cache"
 			}));
@@ -398,13 +398,13 @@
 
 		local function error_handler(event)
 			if event.stanza.attr.from == stanza.attr.to then
-				reject(errutil.from_stanza(event.stanza, event));
+				reject(errors.from_stanza(event.stanza, event));
 				return true;
 			end
 		end
 
 		if iq_cache:get(cache_key) then
-			reject(errutil.new({
+			reject(errors.new({
 				type = "modify", condition = "conflict",
 				text = "IQ stanza id attribute already used",
 			}));
@@ -415,7 +415,7 @@
 		self:hook(error_event, error_handler);
 
 		local timeout_handle = self:add_timer(timeout or 120, function ()
-			reject(errutil.new({
+			reject(errors.new({
 				type = "wait", condition = "remote-server-timeout",
 				text = "IQ stanza timed out",
 			}));
@@ -428,7 +428,7 @@
 		});
 
 		if not ok then
-			reject(errutil.new({
+			reject(errors.new({
 				type = "wait", condition = "internal-server-error",
 				text = "Could not store IQ tracking data"
 			}));