small refactoring of names for better readability