Changed Names and licences