Fix namespace, apply patch from CS fixer tool