add disclaimer; more robust logical names setting; add tests