[namcap] Improvements