update changelog, finish renaming after name conflict