Parameter name consistency issues fixed