EOD - name refactoring