feature #1664: Readding class renaming