diff --git a/server/src/main/java/org/cagnulein/android_remote/Device.java b/server/src/main/java/org/cagnulein/android_remote/Device.java
index 94237fa..11f3cf3 100644
--- a/server/src/main/java/org/cagnulein/android_remote/Device.java
+++ b/server/src/main/java/org/cagnulein/android_remote/Device.java
@@ -14,7 +14,6 @@
 
 public final class Device {
 
-    private final ServiceManager serviceManager = new ServiceManager();
     private ScreenInfo screenInfo;
     private RotationListener rotationListener;
 
@@ -94,15 +93,15 @@ public Point getPhysicalPoint(Position position) {
     }
 
     public boolean injectInputEvent(InputEvent inputEvent, int mode) {
-        return serviceManager.getInputManager().injectInputEvent(inputEvent, mode);
+        return ServiceManager.getInputManager().injectInputEvent(inputEvent, mode);
     }
 
     public boolean isScreenOn() {
-        return serviceManager.getPowerManager().isScreenOn();
+        return ServiceManager.getPowerManager().isScreenOn();
     }
 
     public void registerRotationWatcher(IRotationWatcher rotationWatcher) {
-        serviceManager.getWindowManager().registerRotationWatcher(rotationWatcher);
+        ServiceManager.getWindowManager().registerRotationWatcher(rotationWatcher);
     }
 
     public synchronized void setRotationListener(RotationListener rotationListener) {
diff --git a/server/src/main/java/org/cagnulein/android_remote/FakeContent.java b/server/src/main/java/org/cagnulein/android_remote/FakeContext.java
similarity index 100%
rename from server/src/main/java/org/cagnulein/android_remote/FakeContent.java
rename to server/src/main/java/org/cagnulein/android_remote/FakeContext.java