-- Temp KT-4797
Refactoring: class rename