Make sure there are not clashes/ambiguities of method signatures, renamed interface method

- minor cleanup of usage as well

Signed-off-by: Stefan Marr <git@stefan-marr.de>