Block hash or block header hash?

[Coma]

https://en.bitcoin.it/wiki/Target

The target is a 256-bit number (extremely large) that all Bitcoin clients share. The SHA-256 hash of a block's header must be lower than or equal to the current target for the block to be accepted by the network. The lower the target, the more difficult it is to generate a block.

https://en.bitcoin.it/wiki/Blocks

... A block is "solved" (published and considered valid by peers) when the SHA-256 hash of the entire block is below the current target.

Does both things mean the same?
I'm trying to understand the system better, thank you.

EDIT:
Also I think the Target and Difficulty articles confuses both terms. It should be clearer, IMHO. Guess I'll take it to wiki discussion.

[theymos]

Block hash = block header hash.

A hash of the entire block is never made by Bitcoin, and no one uses such a hash for anything.

All of the block data is indirectly hashed through the hash tree. This is represented in the block hash.