Changed some parameters name to avoid conflicts