Interface rename fix post rebase