Fixed up some more component/controller naming issues.