Remove incompatible flag, rename in defconfig