Some name changes

I created this, and after make it generic, I forgot to change another
variables names