Fixed some type name change fallout