Removed double Buckaroo handling.
Renamed the Buckaroo configuration vars.