fix bug
rename vars
move const char* to char*