Very small refactoring

Rename stuff like Finish() which was confusing with action 'Finish'