Refactoring: Rename End to Final