Move name space out of file name