Try to fix name usage
Merge branch 'bugfix_names' into upstream-4.0-stable