changed some type names