rename and delete controllers and supporting template tweaks for both