diff --git a/platform_device_id/example/lib/main.dart b/platform_device_id/example/lib/main.dart
index d3d597d..03da0d4 100644
--- a/platform_device_id/example/lib/main.dart
+++ b/platform_device_id/example/lib/main.dart
@@ -27,7 +27,7 @@ class _MyAppState extends State<MyApp> {
     String? deviceId;
     // Platform messages may fail, so we use a try/catch PlatformException.
     try {
-      deviceId = await PlatformDeviceId.getDeviceId;
+      deviceId = await PlatformDeviceId.fetchDeviceId();
     } on PlatformException {
       deviceId = 'Failed to get deviceId.';
     }
diff --git a/platform_device_id/lib/platform_device_id.dart b/platform_device_id/lib/platform_device_id.dart
index b650093..f7939c8 100644
--- a/platform_device_id/lib/platform_device_id.dart
+++ b/platform_device_id/lib/platform_device_id.dart
@@ -11,7 +11,7 @@ class PlatformDeviceId {
   static final DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
 
   /// Information derived from `android`-`androidId` or `ios`-`identifierForVendor`
-  static Future<String?> get getDeviceId async {
+  static Future<String?> fetchDeviceId() async {
     String? deviceId;
     try {
       if (kIsWeb) {
diff --git a/platform_device_id/test/platform_device_id_test.dart b/platform_device_id/test/platform_device_id_test.dart
index c2e131b..f111145 100644
--- a/platform_device_id/test/platform_device_id_test.dart
+++ b/platform_device_id/test/platform_device_id_test.dart
@@ -19,7 +19,7 @@ void main() {
   });
 
   test('Get Device ID ', () async {
-    String? deviceID = await PlatformDeviceId.getDeviceId;
+    String? deviceID = await PlatformDeviceId.fetchDeviceId();
     expect(deviceID, '42');
   });
 }
diff --git a/platform_device_id_macos/example/test/widget_test.dart b/platform_device_id_macos/example/test/widget_test.dart
index bc1d70f..299809c 100644
--- a/platform_device_id_macos/example/test/widget_test.dart
+++ b/platform_device_id_macos/example/test/widget_test.dart
@@ -20,7 +20,7 @@ void main() {
       find.byWidgetPredicate((Widget widget) =>
           widget is Text &&
           widget.data != null &&
-          widget.data.startsWith('Running on:')),
+          widget.data!.startsWith('Running on:')),
       findsOneWidget,
     );
   });