donb
committed
on 14 Aug 08
cleaned up some naming issues