Renaming variable names to make them more explicit
Fixes
Updating examples