Fixes #5290 - Fix forgotten classes to rename

Fixes #5290 - Fix forgotten classes to rename

cf http://www.rudder-project.org/redmine/issues/5290