Changed some parameters' name