Rename refactoring

Signed-off-by: Alex Tugarev <telekom@tugarev.de>
Rename refactoring

Signed-off-by: Alex Tugarev <telekom@tugarev.de>