Removed old and added new aliases