Renamed remaing namespace URNs
Updated todo.txt