rename some variables
packages rename
rename some test clases, remove unused references