diff --git a/benchmark/classic/benchmark.sh b/benchmark/classic/benchmark.sh
index 33d24fc..b02c40c 100644
--- a/benchmark/classic/benchmark.sh
+++ b/benchmark/classic/benchmark.sh
@@ -38,11 +38,13 @@ do
     then
         wave_loop=1
         wave_dir_up=true
+        wave_num=1
         while [[ $wave_loop -lt $wave_loop_max ]]; do
                 now=$(date '+%Y-%m-%d-%H-%M')
                 echo -e "Connections: $wave_connection"
                 echo -e "Running"
-                hey -c $wave_connection -z $wave_time -m POST -o csv -host "$function.kubeless" -D "$function_friendly".body  -T "application/json" http://$kuberhost/"$function" > ./data/"$function"."$wave_connection"."$now".wave.csv
+                hey -c $wave_connection -z $wave_time -m POST -o csv -host "$function.kubeless" -D "$function_friendly".body  -T "application/json" http://$kuberhost/"$function" > ./data/"$function"."$wave_num".wave.csv
+                wave_num=$((wave_num + 1))
                 if $wave_dir_up
                 then
                         if [[ $wave_connection -lt $wave_max_conn ]]
diff --git a/functions/scaling/hello-world-py-concurrency.yml b/functions/scaling/hello-world-py-concurrency.yml
index e77ef25..0ad73ac 100644
--- a/functions/scaling/hello-world-py-concurrency.yml
+++ b/functions/scaling/hello-world-py-concurrency.yml
@@ -18,7 +18,7 @@ spec:
         autoscaling.knative.dev/maxScale: "100"
     spec:
       containers:
-        - image: tormachris/hello-world-py
+        - image: tormachris/hello-world-python
           env:
             - name: TARGET
               value: "Py"
diff --git a/functions/scaling/hello-world-py.yml b/functions/scaling/hello-world-py.yml
index 0c3bd38..dd729ac 100644
--- a/functions/scaling/hello-world-py.yml
+++ b/functions/scaling/hello-world-py.yml
@@ -12,7 +12,7 @@ spec:
         autoscaling.knative.dev/metric: cpu
     spec:
       containers:
-        - image: tormachris/hello-world-py
+        - image: tormachris/hello-world-python
           env:
             - name: TARGET
               value: "Go"
diff --git a/functions/scaling/isprime-py-concurrency.yml b/functions/scaling/isprime-py-concurrency.yml
index aa0bae0..e269303 100644
--- a/functions/scaling/isprime-py-concurrency.yml
+++ b/functions/scaling/isprime-py-concurrency.yml
@@ -18,7 +18,7 @@ spec:
         autoscaling.knative.dev/maxScale: "100"
     spec:
       containers:
-        - image: tormachris/isprime-py
+        - image: tormachris/isprime-python
           env:
             - name: TARGET
               value: "Py"
diff --git a/functions/scaling/isprime-py.yml b/functions/scaling/isprime-py.yml
index c8cc760..63efbbb 100644
--- a/functions/scaling/isprime-py.yml
+++ b/functions/scaling/isprime-py.yml
@@ -12,7 +12,7 @@ spec:
         autoscaling.knative.dev/metric: cpu
     spec:
       containers:
-        - image: tormachris/isprime-py
+        - image: tormachris/isprime-python
           env:
             - name: TARGET
               value: "Py"
diff --git a/functions/simple/helloworld-py.yml b/functions/simple/helloworld-py.yml
index 0314fe8..14a6009 100644
--- a/functions/simple/helloworld-py.yml
+++ b/functions/simple/helloworld-py.yml
@@ -7,7 +7,7 @@ spec:
   template:
     spec:
       containers:
-        - image: "tormachris/hello-world-py"
+        - image: "tormachris/hello-world-python"
           env:
             - name: TARGET
               value: "Py"
diff --git a/functions/simple/isprime-py.yml b/functions/simple/isprime-py.yml
index 14e905c..cefd310 100644
--- a/functions/simple/isprime-py.yml
+++ b/functions/simple/isprime-py.yml
@@ -7,7 +7,7 @@ spec:
   template:
     spec:
       containers:
-        - image: "tormachris/isprime-py"
+        - image: "tormachris/isprime-python"
           env:
             - name: TARGET
               value: "107107"