Changed company name & product name