Merge "Applied new package name" into oc-dr1-dev