Rename option; Enable simplified way, since it seems to work