Also suggest names for sources.
Fixes and coding guidelines