Corrected and renamed

Now, it should by more clear....