Merge "Make system item has a consistent name." into oc-mr1-dev