Fixing incorrect comments and DS names

:lipstick:  
small improvements on comment (e.g. incorrect DS and Server names)