Changing name to right one