Merge "Update resource name for renamed string." into klp-dev