Ensure that multiple surveys can be generated for a survey system
Replace name/title by real name/title ensuring that all elements have
names
Bugfixing and Refactoring