Changing name for more coherence