renaming and fix bug#958970

[merge]