Removed old names (who liked backwards compatibility anyways?)