diff --git a/packages/browser-tests/tests/10-fake-api-test.ts b/packages/browser-tests/tests/10-fake-api-test.ts
index 283cd8d..e022870 100644
--- a/packages/browser-tests/tests/10-fake-api-test.ts
+++ b/packages/browser-tests/tests/10-fake-api-test.ts
@@ -2,14 +2,14 @@ import mocha from 'mocha';
 import chai from 'chai';
 import { FakeData, setFakeData, prepareQuery, sendQuery } from './fake-api';
 import { API } from '@iconify/core/lib/api/';
-import { setDefaultAPIModule } from '@iconify/core/lib/api/modules';
+import { setAPIModule } from '@iconify/core/lib/api/modules';
 import { setAPIConfig } from '@iconify/core/lib/api/config';
 import { coreModules } from '@iconify/core/lib/modules';
 
 const expect = chai.expect;
 
 // Set API
-setDefaultAPIModule({
+setAPIModule('', {
 	prepare: prepareQuery,
 	send: sendQuery,
 });
diff --git a/packages/browser-tests/tests/21-scan-dom-api-test.ts b/packages/browser-tests/tests/21-scan-dom-api-test.ts
index eaad3d9..ab2fc2f 100644
--- a/packages/browser-tests/tests/21-scan-dom-api-test.ts
+++ b/packages/browser-tests/tests/21-scan-dom-api-test.ts
@@ -5,7 +5,7 @@ import { getNode } from './node';
 import { addFinder } from '@iconify/iconify/lib/finder';
 import { FakeData, setFakeData, prepareQuery, sendQuery } from './fake-api';
 import { API } from '@iconify/core/lib/api/';
-import { setDefaultAPIModule } from '@iconify/core/lib/api/modules';
+import { setAPIModule } from '@iconify/core/lib/api/modules';
 import { setAPIConfig } from '@iconify/core/lib/api/config';
 import { coreModules } from '@iconify/core/lib/modules';
 import { finder as iconifyFinder } from '@iconify/iconify/lib/finders/iconify';
@@ -20,7 +20,7 @@ addFinder(iconifyFinder);
 addFinder(iconifyIconFinder);
 
 // Set API
-setDefaultAPIModule({
+setAPIModule('', {
 	prepare: prepareQuery,
 	send: sendQuery,
 });
diff --git a/packages/iconify/src/render.ts b/packages/iconify/src/render.ts
index 00dee5f..628a0ab 100644
--- a/packages/iconify/src/render.ts
+++ b/packages/iconify/src/render.ts
@@ -41,6 +41,7 @@ export function renderIcon(
 	const className =
 		'iconify iconify--' +
 		name.prefix +
+		(name.provider === '' ? '' : ' iconify--' + name.provider) +
 		(filteredClassList.length ? ' ' + filteredClassList.join(' ') : '');
 
 	// Generate SVG as string