renamed stuff and updated changelog