Changed some name in order to make it more intuitive.