[Renaming] Took @pyrech feedback into account