Quick and simple question, isn't it?

Aparently MS uses D3D10.h, d3d10misc.h, D3D10effect.h names on their headers (and used similar for D3D9). Traditionally multiple C header files are united in single Pascal header and for D3D naming was: Direct3D, Direct3D8, Direct3D9. Should I continue to use this scheme and call 10 version as Direct3D10, or use shorter D3D10?

D3DX10.pas still is preferrend name for D3DX headers. Or you maybe have any other opinions?