More consistent naming

Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>