Updated comment header to reflect some naming convention changes