Merge branch 'fix-custom-names' into 'master'

Fix issues when the qspace was renamed in the tree

Closes #62

See merge request !91
5 jobs for master