Revert refactoring naming (#2274)