Update to names and dependancies