fiddling with naming convention - menu behavior is much improved.