Updated references to datatypes in two more files