Clean up some namespace handling

plus somehow
`Image:`
does redirect to 
`File:`

so it has to be somewhere right?