change naming to be consistent with DFXML tag names