Fixes #5290 - Fix forgotten classes to rename