Further naming changes following the upstream progress