[Olena-patches] cleanup-2008 r2226: Propagate few renamings