Rename common blocks