Topic/snippets fix

This fixes a couple of snippets (wrong name or wrong snippet) and remove annoying trailing whitespaces on some of them.