asterisk users - Apr 2013 - caller_id vs cid_number

Are these both caller id presentation related? If not, which on is
currently being used. Finally, is there a "latest" sip_peers table
structure to use with 1.8, without the obvious hacks, deprecations.
and redundancies?

Thanks in Advance,

Nick.