Corrections to etdms name space