Removed old names
Added new names