Excutable refactoring + renaming