Changed some naming of methods