refactoring of the evolay struct names