Addd option to keep the original item name