diff --git a/README.md b/README.md
index a76a093..844965a 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-#Limelight-pi
+#Limelight Pi
 
 Limelight is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield,
 but built for Linux/OSX/Windows.
 
-Limelight-pi allows you to stream your full collection of Steam games from
+Limelight Pi allows you to stream your full collection of Steam games from
 your powerful Windows desktop to your Raspberry Pi.
 
 [Limelight-common](https://github.com/limelight-stream/limelight-common) is the shared codebase between
@@ -35,9 +35,9 @@ implementation.
 
 * Ensure your machine and Raspberry Pi are on the same network
 * Turn on Shield Streaming in the GFE settings
-* Start Limelight-pi with -pair option
+* Start Limelight Pi with -pair option
 * Accept the pairing confirmation on your PC
-* Start Limelight-pi normally
+* Start Limelight Pi normally
 * Play games!
 
 ##Compile
diff --git a/src/com/limelight/Limelight.java b/src/com/limelight/Limelight.java
index 344317e..a807d13 100644
--- a/src/com/limelight/Limelight.java
+++ b/src/com/limelight/Limelight.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import com.limelight.nvstream.http.PairingManager;
 
 /**
- * Main class for Limelight-pi
+ * Main class for Limelight Pi
  * @author Diego Waxemberg<br>
  * Cameron Gutman
  * Iwan Timmer