Bugfix quotes in names