diff --git a/.travis.yml b/.travis.yml
index 84b047c..2a296fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,15 +52,15 @@ before_deploy:
 - mkdir -p "wiiu/plugins"
 - commit="$(git rev-parse --short=7 HEAD)"
 - find -type f -name "*.mod" | xargs -i cp {} wiiu/plugins
-- zip -r screenstreamer_wups_nightly_$commit.zip wiiu
+- zip -r screenstreaming_wups_nightly_$commit.zip wiiu
 - git config --local user.name "Maschell"
 - git config --local user.email "Maschell@gmx.de"
-- git tag "ScreenStreamerWUPS-$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)"
+- git tag "ScreenStreaming-$(date +'%Y%m%d%H%M%S')-$(git log --format=%h -1)"
 deploy:
   provider: releases
   skip_cleanup: true
   api_key:
     secure: H3sXW8voP9WWwK9PpSD1BXTFmNwss3z6FjX9UVZUOEga7Yu4Na4yUvDtmpEKOxLvFDjAOkS6tyB1UM0Ft9GNi1Qd2cPpSgsJZx5NiYDkiSc7A1UNEbYuMgS+deILnT3qNrTaXMjLeedyMZSTLTt2iThJVP31bwvOTs2nM08PuSrFO8sa0uuLpFyx9uCcznctZsRmSzaTbey/P2rSvTBSOtFHMkfTPLsBndSF1hEn/UUIoOguLUfuq/ovgTr1i6Bm+OMt35oLaaCnSs0JiglUYyXSHP53/14h4CVvQiq69EjHSSrsF46U60j3HA+05eJaxBnr1FZUWfHc/m245G4oSFjvKKCN0hXeRhcLQg1texz1TcI5PIzEgg50UAl6W1LdZVIksGSySojfH/P9FFUkRxtTzzDAgDz/UWNfnx9N9JEZbRsV0hp6goJSnHj/gpu2wxVdYSAVae3NTe7zYT5Le0l0vgpnVhcSVFaZQiy70xb26JPRa0msxFd3BXzYcGV/c+GsxVXoo0yTMpWae4CbWSonkCuNyPTdVQ05+TAP6KjJO9mEWRj+8XuFkRRUELiM7Oe5rHY0nIyQwECbF3yoQP3FDaw+WNhrs+d8ETbZ+uM9UcsCy9h9eGJCgbTU96mVylf9tXCUoVEEUBjXOYgs/joQy83hjCDCS96KVJNLI8g=
-  file: screenstreamer_wups_nightly_$commit.zip
+  file: screenstreaming_wups_nightly_$commit.zip
   on:
     repo: Maschell/StreamingPluginWiiU
diff --git a/makefile.mk b/makefile.mk
index d2d7798..9260b72 100644
--- a/makefile.mk
+++ b/makefile.mk
@@ -16,7 +16,7 @@ WUT_ENABLE_CPP      := 0
 WUT_DEFAULT_MALLOC  := 1
 
 # Target filename
-TARGET              := screenstreamer.mod
+TARGET              := screenstreaming.mod
 
 # Source directories
 SOURCES             := src/