Small tuning and name refactoring.