fixed namespacing-issues
See commenton issue https://jira.intra.politaktiv.org/browse/PA-565 from
04-13-2014 for further information