Refactor Name (Main)