Removed the deprecated naming stuff.