Refactor for fillup name change