Change namings.

Signed-off-by: Philipp Offermann <philipp.offermann@telekom.de>