fix namings/spellings

fixed some naming conventions and spelling mistakes