changed function names, moved from wrapper funcs to optional params
Signed-off-by: Leo Bärring <leo.barring@gmail.com>