Refactor: parameters simplification. Change functions names
Adapt tests