diff --git a/README.md b/README.md
index 0927ef6c..fa6e12fb 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ All in all, RNFirebase provides much faster performance (~2x) over the web SDK a
 |  _-- Multiple Apps_        |   ❌   |   ✅   |   ✅   |   ✅   |   ✅   |   ✅   |   ✅   |
 | **Cloud Firestore**        |   ❌   |   ✅   |   ✅   |   ✅   |   ✅   |   ✅   | **?**  |
 |  _-- Transactions          |   ❌   |   ❌   |   ❌   |   ❌   |   ✅   |   ✅   |   ✅   |
-| **Cloud Messaging (FCM)**  |   ✅   |   ✅   |   ✅   |   ✅   |   ✅   |   ✅   | **?**  |
+| **Cloud Messaging (FCM)**  |   ✅   |   ✅   |   ✅   |   ✅   |   ✅   |   ✅   |   ❌   |
 | **Crashlytics**            |   ❌   |   ❌   |   ❌   |   ✅   |   ✅   |   ✅   |   ❌   |
 | **Crash Reporting**        |   ✅   |   ✅   |   ✅   |   ✅   |   ✅   |   ✅   |   ❌   |
 | **Dynamic Links**          |   ❌   |   ❌   |   ✅   |   ✅   |   ✅   |   ✅   |   ❌   |
diff --git a/lib/modules/core/app.js b/lib/modules/core/app.js
index 352ec7d4..2d225544 100644
--- a/lib/modules/core/app.js
+++ b/lib/modules/core/app.js
@@ -18,7 +18,7 @@ import Crashlytics, {
 } from '../fabric/crashlytics';
 import Database, { NAMESPACE as DatabaseNamespace } from '../database';
 import Firestore, { NAMESPACE as FirestoreNamespace } from '../firestore';
-import InstanceId, { NAMESPACE as InstanceIdNamespace } from '../instanceid';
+import InstanceId, { NAMESPACE as InstanceIdNamespace } from '../iid';
 import Invites, { NAMESPACE as InvitesNamespace } from '../invites';
 import Links, { NAMESPACE as LinksNamespace } from '../links';
 import Messaging, { NAMESPACE as MessagingNamespace } from '../messaging';
@@ -49,7 +49,7 @@ export default class App {
     crashlytics: () => Crashlytics,
   };
   firestore: () => Firestore;
-  instanceid: () => InstanceId;
+  iid: () => InstanceId;
   invites: () => Invites;
   links: () => Links;
   messaging: () => Messaging;
@@ -91,7 +91,7 @@ export default class App {
       crashlytics: APPS.appModule(this, CrashlyticsNamespace, Crashlytics),
     };
     this.firestore = APPS.appModule(this, FirestoreNamespace, Firestore);
-    this.instanceid = APPS.appModule(this, InstanceIdNamespace, InstanceId);
+    this.iid = APPS.appModule(this, InstanceIdNamespace, InstanceId);
     this.invites = APPS.appModule(this, InvitesNamespace, Invites);
     this.links = APPS.appModule(this, LinksNamespace, Links);
     this.messaging = APPS.appModule(this, MessagingNamespace, Messaging);
diff --git a/lib/modules/core/firebase.js b/lib/modules/core/firebase.js
index 91f3ffcc..a4f7d43c 100644
--- a/lib/modules/core/firebase.js
+++ b/lib/modules/core/firebase.js
@@ -41,7 +41,7 @@ import {
 import {
   statics as InstanceIdStatics,
   MODULE_NAME as InstanceIdModuleName,
-} from '../instanceid';
+} from '../iid';
 import {
   statics as InvitesStatics,
   MODULE_NAME as InvitesModuleName,
@@ -102,7 +102,7 @@ class Firebase {
   database: DatabaseModule;
   fabric: FabricModule;
   firestore: FirestoreModule;
-  instanceid: InstanceIdModule;
+  iid: InstanceIdModule;
   invites: InvitesModule;
   links: LinksModule;
   messaging: MessagingModule;
@@ -148,8 +148,8 @@ class Firebase {
       FirestoreStatics,
       FirestoreModuleName
     );
-    this.instanceid = APPS.moduleAndStatics(
-      'instanceid',
+    this.iid = APPS.moduleAndStatics(
+      'iid',
       InstanceIdStatics,
       InstanceIdModuleName
     );
diff --git a/lib/modules/instanceid/index.js b/lib/modules/iid/index.js
similarity index 94%
rename from lib/modules/instanceid/index.js
rename to lib/modules/iid/index.js
index 0cd6528d..00eba061 100644
--- a/lib/modules/instanceid/index.js
+++ b/lib/modules/iid/index.js
@@ -8,7 +8,7 @@ import { getNativeModule } from '../../utils/native';
 import type App from '../core/app';
 
 export const MODULE_NAME = 'RNFirebaseInstanceId';
-export const NAMESPACE = 'instanceid';
+export const NAMESPACE = 'iid';
 
 export default class InstanceId extends ModuleBase {
   constructor(app: App) {
diff --git a/lib/types/index.js b/lib/types/index.js
index c0ea162a..cce17c8b 100644
--- a/lib/types/index.js
+++ b/lib/types/index.js
@@ -15,8 +15,8 @@ import type Database from '../modules/database';
 import { typeof statics as DatabaseStatics } from '../modules/database';
 import type Firestore from '../modules/firestore';
 import { typeof statics as FirestoreStatics } from '../modules/firestore';
-import type InstanceId from '../modules/instanceid';
-import { typeof statics as InstanceIdStatics } from '../modules/instanceid';
+import type InstanceId from '../modules/iid';
+import { typeof statics as InstanceIdStatics } from '../modules/iid';
 import type Invites from '../modules/invites';
 import { typeof statics as InvitesStatics } from '../modules/invites';
 import type Links from '../modules/links';
@@ -81,7 +81,7 @@ export type FirebaseNamespace =
   | 'crashlytics'
   | 'database'
   | 'firestore'
-  | 'instanceid'
+  | 'iid'
   | 'invites'
   | 'links'
   | 'messaging'