Revert some naming convertions, remove client part