Rename and add options