Fixed Shi-Yang's name