Fix linting errors
Update of DDI->DC mapping