IDE-206
do some rename