fixed const and vars names and fixing vars