Fix the varying names for DEFAULT_TARGETS

WARNING: This commit was cherry picked!