[OE-3736] Removed dependency on module name