#407. Fixing message in case of changing of short name