Fixing duration+resetting connection
Renaming variables and classes

For a description for thesis