fix namings and typos