Replaced the old names