[SUITEDEV-2114] rename method
[SUITEDEV-2114] rename classes