Rename as per 3 key points