Fixing duplicated code
Renaming to CDIProxies