Fixed DSDL template to prevent name clashing with user defined types