consolidated naming