[Client] renaming main module elements