diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module
index 0f68663..adf9f0f 100644
--- a/core/modules/block/custom_block/custom_block.module
+++ b/core/modules/block/custom_block/custom_block.module
@@ -182,8 +182,9 @@ function custom_block_entity_info_alter(&$types) {
  */
 function custom_block_entity_bundle_info() {
   $bundles = array();
-  foreach (entity_load_multiple('custom_block_type') as $id => $custom_block_type) {
-    $bundles['custom_block'][$id]['label'] = $custom_block_type->label();
+  foreach (config_get_storage_names_with_prefix('custom_block.type.') as $config_name) {
+    $config = config($config_name);
+    $bundles['custom_block'][$config->get('id')]['label'] = $config->get('label');
   }
   return $bundles;
 }
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index 077d08a..3ef1ce6 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -174,8 +174,9 @@ function _contact_personal_tab_access($account) {
  */
 function contact_entity_bundle_info() {
   $bundles = array();
-  foreach (entity_load_multiple('contact_category') as $id => $category) {
-    $bundles['contact_message'][$id]['label'] = $category->label();
+  foreach (config_get_storage_names_with_prefix('contact.category.') as $config_name) {
+    $config = config($config_name);
+    $bundles['contact_message'][$config->get('id')]['label'] = $config->get('label');
   }
   return $bundles;
 }
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index ca7f1fc..bf38bf2 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -123,8 +123,9 @@ function taxonomy_entity_view_mode_info() {
  */
 function taxonomy_entity_bundle_info() {
   $bundles = array();
-  foreach (entity_load_multiple('taxonomy_vocabulary') as $id => $vocab) {
-    $bundles['taxonomy_term'][$id]['label'] = $vocab->label();
+  foreach (taxonomy_vocabulary_get_names() as $id) {
+    $config = config('taxonomy.vocabulary.' . $id);
+    $bundles['taxonomy_term'][$id]['label'] = $config->get('name');
   }
   return $bundles;
 }