Doctor Who 2005 naming

Refer below

My naming is as follows, works ok