Adding option to remove Controller from the name