Thank you, Mike. My main question is whether the distinction between "tap" and "faucet" is not maintained in this context in AmE or not, since as far as I know, "tap" isn't used in American English. I also remember seeing an American movie in which one of the actors (an American) asked the waiter for "tap water".