Fixed up some names