done rename in some files to improve code quallity.