some more rename stuff for merged content.