Changing name of softmax
Merge