fixed migration naming conflict