Interfaces and Implemations changing names convention
Remove client part