(cherry picked from commit 4a4f247914)
4a4f247914
The former name was incorrect in English, though for us latin lovers it's an understandable mistake. Second part of and closes #3626.