Updated reference to Customer/Customer (what a stupid name that was anyway!)