resolving remaining conflict
Merge pull request #2 from AvisoNovate/dimitris.rook

resolving remaining conflict ('namespace' -> 'namespace-name')