diff --git a/ios/Classes/LiveKitPlugin.h b/ios/Classes/LiveKitPlugin.h
new file mode 100644
index 000000000..e6e50ef99
--- /dev/null
+++ b/ios/Classes/LiveKitPlugin.h
@@ -0,0 +1,4 @@
+#import <Flutter/Flutter.h>
+
+@interface LiveKitPlugin : NSObject<FlutterPlugin>
+@end
diff --git a/ios/Classes/LivekitClientPlugin.m b/ios/Classes/LiveKitPlugin.m
similarity index 78%
rename from ios/Classes/LivekitClientPlugin.m
rename to ios/Classes/LiveKitPlugin.m
index 670eb810c..f16b3b3f0 100644
--- a/ios/Classes/LivekitClientPlugin.m
+++ b/ios/Classes/LiveKitPlugin.m
@@ -1,4 +1,4 @@
-#import "LiveKitClientPlugin.h"
+#import "LiveKitPlugin.h"
 #if __has_include(<livekit_client/livekit_client-Swift.h>)
 #import <livekit_client/livekit_client-Swift.h>
 #else
@@ -8,8 +8,8 @@
 #import "livekit_client-Swift.h"
 #endif
 
-@implementation LiveKitClientPlugin
+@implementation LiveKitPlugin
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-  [SwiftLiveKitClientPlugin registerWithRegistrar:registrar];
+  [SwiftLiveKitPlugin registerWithRegistrar:registrar];
 }
 @end
diff --git a/ios/Classes/LivekitClientPlugin.h b/ios/Classes/LivekitClientPlugin.h
deleted file mode 100644
index 1219c0d84..000000000
--- a/ios/Classes/LivekitClientPlugin.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#import <Flutter/Flutter.h>
-
-@interface LiveKitClientPlugin : NSObject<FlutterPlugin>
-@end
diff --git a/ios/Classes/SwiftLiveKitClientPlugin.swift b/ios/Classes/SwiftLiveKitPlugin.swift
similarity index 97%
rename from ios/Classes/SwiftLiveKitClientPlugin.swift
rename to ios/Classes/SwiftLiveKitPlugin.swift
index 14aa2bea1..2571257b6 100644
--- a/ios/Classes/SwiftLiveKitClientPlugin.swift
+++ b/ios/Classes/SwiftLiveKitPlugin.swift
@@ -2,10 +2,10 @@ import Flutter
 import UIKit
 import WebRTC
 
-public class SwiftLiveKitClientPlugin: NSObject, FlutterPlugin {
+public class SwiftLiveKitPlugin: NSObject, FlutterPlugin {
     public static func register(with registrar: FlutterPluginRegistrar) {
         let channel = FlutterMethodChannel(name: "livekit_client", binaryMessenger: registrar.messenger())
-        let instance = SwiftLiveKitClientPlugin()
+        let instance = SwiftLiveKitPlugin()
         registrar.addMethodCallDelegate(instance, channel: channel)
     }
 
diff --git a/lib/src/room.dart b/lib/src/room.dart
index 5672b3fcb..bed4b1a64 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -1,7 +1,6 @@
 import 'dart:collection';
 
 import 'package:collection/collection.dart';
-import 'package:flutter/foundation.dart';
 
 import 'constants.dart';
 import 'events.dart';
diff --git a/pubspec.yaml b/pubspec.yaml
index 0ace21913..689cccebe 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -33,4 +33,4 @@ flutter:
   plugin:
     platforms:
       ios:
-        pluginClass: LiveKitClientPlugin
+        pluginClass: LiveKitPlugin