Fixed data tools naming bugs