replaced variable type names with newly defined ones
replaced type names with newly-defined ones