Change Interface/impelmentation names because of namespaces