Updated header names, calc CDV for RT, shorten RTC, rem R_DATA