diff --git a/Setup-Guide.md b/Setup-Guide.md
index 8938840..cd7266d 100644
--- a/Setup-Guide.md
+++ b/Setup-Guide.md
@@ -1,6 +1,6 @@
 In this guide: 
-* [Prerequisites](https://github.com/limelight-stream/limelight-android/wiki/Setup-Guide#prerequisites)
-* [Quick Setup Instructions](https://github.com/limelight-stream/limelight-android/wiki/Setup-Guide#quick-setup-instructions)
+* [Prerequisites](https://github.com/moonlight-stream/moonlight-android/wiki/Setup-Guide#prerequisites)
+* [Quick Setup Instructions](https://github.com/moonlight-stream/moonlight-android/wiki/Setup-Guide#quick-setup-instructions)
 
 ***
 
@@ -24,7 +24,7 @@ _MOGA controller users_:
 If your controller has a switch with A and B, it must be switched to B to be used for streaming. If you have no switch, use the MOGA Universal Driver app.
 
 _SixAxis controller users_:
-Use SixAxis in "Native Gamepad" mode for Limelight. The default button mapping needs to be adjusted to match the standard controller layout for streaming.
+Use SixAxis in "Native Gamepad" mode. The default button mapping needs to be adjusted to match the standard controller layout for streaming.
 
 ##Quick Setup Instructions:
 1. Make sure GeForce Experience is installed, updated, and that you've scanned for games.