fixing some name change errors...