Merge "Correct naming to make it clear" into udc-dev