Callers moved in their namespace, some scrutinizer ci fixes