diff --git a/build_library/configure_bootloaders.sh b/build_library/configure_bootloaders.sh
index 27b862cbec..f163074f72 100755
--- a/build_library/configure_bootloaders.sh
+++ b/build_library/configure_bootloaders.sh
@@ -45,11 +45,11 @@ configure_pvgrub() {
   sudo_clobber "${GRUB_DIR}/menu.lst.A" <<EOF
 timeout         0
 
-title           CoreOS A Root
+title           Flatcar A Root
 root            (hd0,0)
 kernel          /syslinux/vmlinuz.A ${grub_args} ${slot_a_args}
 
-title           CoreOS B Root
+title           Flatcar B Root
 root            (hd0,0)
 kernel          /syslinux/vmlinuz.B ${grub_args} ${slot_b_args}
 EOF
diff --git a/build_library/grub.cfg b/build_library/grub.cfg
index 6104f5ffd0..262be40cb6 100644
--- a/build_library/grub.cfg
+++ b/build_library/grub.cfg
@@ -11,7 +11,7 @@ insmod all_video
 set default="coreos"
 set timeout=1
 
-# Default kernel args for root filesystem, console, and CoreOS.
+# Default kernel args for root filesystem, console, and Flatcar.
 set linux_root="root=LABEL=ROOT"
 set linux_console=""
 set first_boot=""
@@ -133,8 +133,8 @@ function gptprio {
     if [ $? -ne 0 -o -z "$usr_uuid" ]; then
         echo
         echo "Reading or updating the GPT failed!"
-        echo "Please file a bug with any messages above to CoreOS:"
-        echo " https://issues.coreos.com"
+        echo "Please file a bug with any messages above to Flatcar:"
+        echo " https://issues.flatcar-linux.org"
         abort
     fi
 
@@ -146,15 +146,15 @@ function gptprio {
     fi
 }
 
-menuentry "CoreOS default" --id=coreos {
+menuentry "Flatcar default" --id=coreos {
     gptprio
     linux$suf $gptprio_kernel $gptprio_cmdline $linux_cmdline
 }
 
-menuentry "CoreOS USR-A" --id=coreos-a {
+menuentry "Flatcar USR-A" --id=coreos-a {
    linux$suf /coreos/vmlinuz-a @@MOUNTUSR@@=PARTLABEL=USR-A $linux_cmdline
 }
 
-menuentry "CoreOS USR-B" --id=coreos-b {
+menuentry "Flatcar USR-B" --id=coreos-b {
    linux$suf /coreos/vmlinuz-b @@MOUNTUSR@@=PARTLABEL=USR-B $linux_cmdline
 }
diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release
index 3c7a88cdc2..520efbd9c9 100755
--- a/build_library/set_lsb_release
+++ b/build_library/set_lsb_release
@@ -25,9 +25,10 @@ ROOT_FS_DIR="$FLAGS_root"
 [ -n "$ROOT_FS_DIR" ] || die "--root is required."
 [ -d "$ROOT_FS_DIR" ] || die "Root FS does not exist? ($ROOT_FS_DIR)"
 
-OS_NAME="Container Linux by CoreOS"
+OS_NAME="Flatcar Linux by Kinvolk"
 OS_CODENAME="Rhyolite"
-OS_ID="coreos"
+OS_ID="flatcar"
+OS_ID_LIKE="coreos"
 OS_PRETTY_NAME="$OS_NAME $COREOS_VERSION (${OS_CODENAME})"
 
 # temporarily point arm at a different appid until update support
@@ -52,13 +53,14 @@ sudo ln -sf "../usr/share/coreos/lsb-release" "${ROOT_FS_DIR}/etc/lsb-release"
 sudo_clobber "${ROOT_FS_DIR}/usr/lib/os-release" <<EOF
 NAME="$OS_NAME"
 ID=$OS_ID
+ID_LIKE=$OS_ID_LIKE
 VERSION=$COREOS_VERSION
 VERSION_ID=$COREOS_VERSION_ID
 BUILD_ID=$COREOS_BUILD_ID
 PRETTY_NAME="$OS_PRETTY_NAME"
 ANSI_COLOR="38;5;75"
-HOME_URL="https://coreos.com/"
-BUG_REPORT_URL="https://issues.coreos.com"
+HOME_URL="https://flatcar-linux.org/"
+BUG_REPORT_URL="https://issues.flatcar-linux.org"
 COREOS_BOARD="$FLAGS_board"
 EOF
 sudo ln -sf "../usr/lib/os-release" "${ROOT_FS_DIR}/etc/os-release"
@@ -72,7 +74,7 @@ COREOS_RELEASE_APPID=$COREOS_APPID
 EOF
 
 sudo_clobber "${ROOT_FS_DIR}/usr/share/coreos/update.conf" <<EOF
-SERVER=https://public.update.core-os.net/v1/update/
+SERVER=https://public.update.flatcar-linux.net/v1/update/
 GROUP=$FLAGS_group
 EOF
 
diff --git a/update_chroot b/update_chroot
index 10738f9f75..7a9549e820 100755
--- a/update_chroot
+++ b/update_chroot
@@ -159,7 +159,7 @@ fi
 
 info "Updating chroot:"
 info " chroot version: $OLDVER"
-info " CoreOS version: $COREOS_VERSION"
+info " Flatcar version: $COREOS_VERSION"
 
 # Updates should be of the form 1.2.3_desc.sh
 for update_script in ${SCRIPTS_DIR}/sdk_lib/updates/*.sh; do