Merge "[AWARE] Change Aware resource API name"