updated main client files with _ prefix