Resolve "Unify parameter names for variants"
Acceptance criteria
-
Coverage is higher or equal to coverage on master 
-
CI runs without problems -
Code doesn't contain TODOs or unused functions -
Code has been inspected and deemed to have decent quality [effectiveGo]: https://golang.org/doc/effective_go.html
Closes #169 (closed)
Edited by Matthias Gürtler