Some rebranding
Bit more debranding
Merge pull request #3 from swissslinky/master

Some (de|re)branding of things.