Changed function names
Merge branch 'tomitoivio.eu' of https://github.com/TomiToivio/_s into tomitoivio.eu
Changed function names