diff --git a/PlexPy.py b/Tautulli.py
old mode 100755
new mode 100644
similarity index 100%
rename from PlexPy.py
rename to Tautulli.py
diff --git a/init-scripts/init-alt.freebsd b/init-scripts/init-alt.freebsd
index 4a008d0b..7d32bbac 100755
--- a/init-scripts/init-alt.freebsd
+++ b/init-scripts/init-alt.freebsd
@@ -43,7 +43,7 @@ fi
 status_cmd="${name}_status"
 stop_cmd="${name}_stop"
 
-command="${tautulli_dir}/PlexPy.py"
+command="${tautulli_dir}/Tautulli.py"
 command_args="--daemon --quiet --nolaunch --port ${PORT} --pidfile ${tautulli_pid} --config ${tautulli_conf}"
 
 # Check for wget and refuse to start without it.
@@ -61,7 +61,7 @@ fi
 verify_tautulli_pid() {
     # Make sure the pid corresponds to the Tautulli process.
     pid=`cat ${tautulli_pid} 2>/dev/null`
-    ps -p ${pid} | grep -q "python ${tautulli_dir}/PlexPy.py"
+    ps -p ${pid} | grep -q "python ${tautulli_dir}/Tautulli.py"
     return $?
 }
 
diff --git a/init-scripts/init.fedora.centos.service b/init-scripts/init.fedora.centos.service
index e782148c..fd6b78e8 100644
--- a/init-scripts/init.fedora.centos.service
+++ b/init-scripts/init.fedora.centos.service
@@ -30,7 +30,7 @@ options=" --daemon --config $configfile --pidfile $pidfile --datadir $datadir --
 start() {
         # Start daemon.
         echo -n $"Starting $prog: "
-        daemon --pidfile=$pidfile $nice $python27 $homedir/PlexPy.py $options
+        daemon --pidfile=$pidfile $nice $python27 $homedir/Tautulli.py $options
         RETVAL=$?
         echo
         [ $RETVAL -eq 0 ] && touch $lockfile
diff --git a/init-scripts/init.freebsd b/init-scripts/init.freebsd
index 4fd720fc..6a3a1045 100755
--- a/init-scripts/init.freebsd
+++ b/init-scripts/init.freebsd
@@ -38,7 +38,7 @@ load_rc_config ${name}
 status_cmd="${name}_status"
 stop_cmd="${name}_stop"
 
-command="${tautulli_dir}/PlexPy.py"
+command="${tautulli_dir}/Tautulli.py"
 command_args="--daemon --pidfile ${tautulli_pid} --quiet --nolaunch ${tautulli_flags}"
 
 # Ensure user is root when running this script.
@@ -51,7 +51,7 @@ verify_tautulli_pid() {
     # Make sure the pid corresponds to the Tautulli process.
     if [ -f ${tautulli_pid} ]; then
       pid=`cat ${tautulli_pid} 2>/dev/null`
-      ps -p ${pid} | grep -q "python2 ${tautulli_dir}/PlexPy.py"
+      ps -p ${pid} | grep -q "python2 ${tautulli_dir}/Tautulli.py"
       return $?
     else
       return 0
diff --git a/init-scripts/init.freenas b/init-scripts/init.freenas
index 6f9dafa8..5010d233 100755
--- a/init-scripts/init.freenas
+++ b/init-scripts/init.freenas
@@ -38,7 +38,7 @@ load_rc_config ${name}
 status_cmd="${name}_status"
 stop_cmd="${name}_stop"
 
-command="${tautulli_dir}/PlexPy.py"
+command="${tautulli_dir}/Tautulli.py"
 command_args="--daemon --pidfile ${tautulli_pid} --quiet --nolaunch ${tautulli_flags}"
 
 # Ensure user is root when running this script.
@@ -51,7 +51,7 @@ verify_tautulli_pid() {
     # Make sure the pid corresponds to the Tautulli process.
     if [ -f ${tautulli_pid} ]; then
       pid=`cat ${tautulli_pid} 2>/dev/null`
-      ps -p ${pid} | grep -q "python2 ${tautulli_dir}/PlexPy.py"
+      ps -p ${pid} | grep -q "python2 ${tautulli_dir}/Tautulli.py"
       return $?
     else
       return 0
diff --git a/init-scripts/init.osx b/init-scripts/init.osx
index b027c491..452b87b6 100755
--- a/init-scripts/init.osx
+++ b/init-scripts/init.osx
@@ -8,7 +8,7 @@
   <array>
        <!-- Modify these two lines if you need to to reflect your python location and Tautulli install location -->
        <string>/usr/bin/python</string>
-       <string>/Applications/Tautulli/PlexPy.py</string>
+       <string>/Applications/Tautulli/Tautulli.py</string>
   </array>
   <key>RunAtLoad</key>
   <true/>
diff --git a/init-scripts/init.solaris11 b/init-scripts/init.solaris11
index cf8f501f..ac7f523e 100755
--- a/init-scripts/init.solaris11
+++ b/init-scripts/init.solaris11
@@ -22,7 +22,7 @@
             <method_credential user="tautulli" group="nogroup"/>
         </method_context>
 
-        <exec_method type="method" name="start" exec="python /opt/Tautulli/PlexPy.py --daemon --quiet --nolaunch" timeout_seconds="60"/>
+        <exec_method type="method" name="start" exec="python /opt/Tautulli/Tautulli.py --daemon --quiet --nolaunch" timeout_seconds="60"/>
 
         <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60"/>
 
diff --git a/init-scripts/init.systemd b/init-scripts/init.systemd
index 6dd7b321..93650c79 100644
--- a/init-scripts/init.systemd
+++ b/init-scripts/init.systemd
@@ -44,7 +44,7 @@
 Description=Tautulli - Stats for Plex Media Server usage
 
 [Service]
-ExecStart=/opt/Tautulli/PlexPy.py --quiet --daemon --nolaunch --config /opt/Tautulli/config.ini --datadir /opt/Tautulli
+ExecStart=/opt/Tautulli/Tautulli.py --quiet --daemon --nolaunch --config /opt/Tautulli/config.ini --datadir /opt/Tautulli
 GuessMainPID=no
 Type=forking
 User=tautulli
diff --git a/init-scripts/init.ubuntu b/init-scripts/init.ubuntu
index c5c7a919..b6d2345e 100755
--- a/init-scripts/init.ubuntu
+++ b/init-scripts/init.ubuntu
@@ -27,7 +27,7 @@
 ## sudo service tautulli restart
 ##
 ## TAUTULLI_USER=         #$RUN_AS, username to run Tautulli under, the default is tautulli
-## TAUTULLI_HOME=         #$APP_PATH, the location of PlexPy.py, the default is /opt/Tautulli
+## TAUTULLI_HOME=         #$APP_PATH, the location of Tautulli.py, the default is /opt/Tautulli
 ## TAUTULLI_DATA=         #$DATA_DIR, the location of plexpy.db, cache, logs, the default is /opt/Tautulli
 ## TAUTULLI_PIDFILE=      #$PID_FILE, the location of tautulli.pid, the default is /var/run/tautulli/tautulli.pid
 ## PYTHON_BIN=      #$DAEMON, the location of the python binary, the default is /usr/bin/python
@@ -86,7 +86,7 @@ load_settings() {
         # Run as username
         RUN_AS=${TAUTULLI_USER-tautulli}
 
-        # Path to app TAUTULLI_HOME=path_to_app_PlexPy.py
+        # Path to app TAUTULLI_HOME=path_to_app_Tautulli.py
         APP_PATH=${TAUTULLI_HOME-/opt/Tautulli}
 
         # Data directory where plexpy.db, cache and logs are stored
@@ -109,7 +109,7 @@ load_settings() {
             PORT_OPTS=" --port=${TAUTULLI_PORT} "
         }
 
-        DAEMON_OPTS=" PlexPy.py --quiet --daemon --nolaunch --pidfile=${PID_FILE} --datadir=${DATA_DIR} ${PORT_OPTS}${EXTRA_DAEMON_OPTS}"
+        DAEMON_OPTS=" Tautulli.py --quiet --daemon --nolaunch --pidfile=${PID_FILE} --datadir=${DATA_DIR} ${PORT_OPTS}${EXTRA_DAEMON_OPTS}"
 
         SETTINGS_LOADED=TRUE
     fi
diff --git a/init-scripts/init.upstart b/init-scripts/init.upstart
index 32778837..7713b143 100755
--- a/init-scripts/init.upstart
+++ b/init-scripts/init.upstart
@@ -15,4 +15,4 @@ pre-start script
     [ -d "$DATA" ] || mkdir -p "$DATA"
 end script
 
-exec PlexPy.py --nolaunch --config "$CONFIG"/config.ini --datadir "$DATA"
+exec Tautulli.py --nolaunch --config "$CONFIG"/config.ini --datadir "$DATA"