Development fix

Fix typing and naming issues in the files

@mostafa.hadizadeh please confirm that everything is still running as you expect it to do 😅

I you are ok with the changes, feel free to merge this MR