Change names for compatibility with IPython 1.0alpha