fixed some NameErrors

--HG--
branch : trunk
6 files changed