Controller updates and name change