Merge branch 'cleanup/instationary' into 'master'

[cleanup] Make function names more consistent

Small name changes. I succesfully ran all tests.

See merge request !18