Changed some not undesteanable names