diff --git a/SpotifyAudioRecorder.py b/AudioRecorder.py
similarity index 94%
rename from SpotifyAudioRecorder.py
rename to AudioRecorder.py
index 785ae352a7a580082178424d3d2f9c3122e5b962..eb123a147085b7c72e97c340f8cc29a4e4428b5d 100644
--- a/SpotifyAudioRecorder.py
+++ b/AudioRecorder.py
@@ -6,10 +6,10 @@ import pyaudiowpatch as pyaudio
 from TheCodeLabs_BaseUtils.DefaultLogger import DefaultLogger
 
 LOG_FORMAT = '[%(levelname)-7s] - %(asctime)s - %(message)s'
-LOGGER = DefaultLogger().create_logger_if_not_exists('SpotifyAudioRecorder', logFormat=LOG_FORMAT)
+LOGGER = DefaultLogger().create_logger_if_not_exists('AudioRecorder', logFormat=LOG_FORMAT)
 
 
-class SpotifyAudioRecorder:
+class AudioRecorder:
     _CHUNK_SIZE = 512
 
     def __init__(self, deviceName: str, destinationFilePath: str):
@@ -59,7 +59,7 @@ class SpotifyAudioRecorder:
 
 
 if __name__ == '__main__':
-    recorder = SpotifyAudioRecorder(
+    recorder = AudioRecorder(
         deviceName='3/4 - Musik (2- GIGAPort HD Audio driver) [Loopback]',
         destinationFilePath='C:/Users/RobertG/Desktop/output.wav'
     )
diff --git a/SpotifyRecorder.py b/SpotifyRecorder.py
index 9374eb12818b9c07293a87798b3dfca5742dd5ca..7b50122c9754205f909312af76240eb15f221a4b 100644
--- a/SpotifyRecorder.py
+++ b/SpotifyRecorder.py
@@ -7,7 +7,7 @@ import spotipy
 from TheCodeLabs_BaseUtils.DefaultLogger import DefaultLogger
 from spotipy import SpotifyOAuth, CacheFileHandler
 
-from SpotifyAudioRecorder import SpotifyAudioRecorder
+from AudioRecorder import AudioRecorder
 
 LOG_FORMAT = '[%(levelname)-7s] - %(asctime)s - %(message)s'
 LOGGER = DefaultLogger().create_logger_if_not_exists('SpotifyRecorder', logFormat=LOG_FORMAT)
@@ -111,8 +111,8 @@ class SpotifyRecorder:
             try:
                 self.__stop_playback_if_playing(deviceId)
 
-                filePath = self.__determine_file_path(indexInPlaylist + 1, track)
-                recorder = SpotifyAudioRecorder(self._audioDeviceName, filePath)
+                filePath = self.__determine_file_path(indexInPlaylist, track)
+                recorder = AudioRecorder(self._audioDeviceName, filePath)
                 with recorder.record():
                     self.__play_track(deviceId, track['track']['uri'])
                     timeWaitedForPlaying = self.__wait_for_track_playing(track['track']['id'])