diff --git a/src/core/server/logging/README.md b/src/core/server/logging/README.md
index 548fd0f07e1ab..067a5d6024e73 100644
--- a/src/core/server/logging/README.md
+++ b/src/core/server/logging/README.md
@@ -54,7 +54,7 @@ There are two types of layout supported at the moment: `pattern` and `json`.
 
 With `pattern` layout it's possible to define a string pattern with special placeholders wrapped into curly braces that
 will be replaced with data from the actual log message. By default the following pattern is used: 
-`[%date][%level][%context%]%meta {message}`. Also `highlight` option can be enabled for `pattern` layout so that
+`[%date][%level][%logger]%meta {message}`. Also `highlight` option can be enabled for `pattern` layout so that
 some parts of the log message are highlighted with different colors that may be quite handy if log messages are forwarded
 to the terminal with color support.
 
diff --git a/src/core/server/logging/integration_tests/logging.test.ts b/src/core/server/logging/integration_tests/logging.test.ts
index 833a0bbd33689..b88f5ba2c2b60 100644
--- a/src/core/server/logging/integration_tests/logging.test.ts
+++ b/src/core/server/logging/integration_tests/logging.test.ts
@@ -29,7 +29,7 @@ function createRoot() {
           layout: {
             highlight: false,
             kind: 'pattern',
-            pattern: '%level|%context|%message',
+            pattern: '%level|%logger|%message',
           },
         },
       },
diff --git a/src/core/server/logging/layouts/conversions/index.ts b/src/core/server/logging/layouts/conversions/index.ts
index a67233a78cee7..23e6aded6c6f7 100644
--- a/src/core/server/logging/layouts/conversions/index.ts
+++ b/src/core/server/logging/layouts/conversions/index.ts
@@ -18,7 +18,7 @@
  */
 export { Conversion } from './type';
 
-export { ContextConversion } from './context';
+export { LoggerConversion } from './logger';
 export { LevelConversion } from './level';
 export { MessageConversion } from './message';
 export { MetaConversion } from './meta';
diff --git a/src/core/server/logging/layouts/conversions/context.ts b/src/core/server/logging/layouts/conversions/logger.ts
similarity index 93%
rename from src/core/server/logging/layouts/conversions/context.ts
rename to src/core/server/logging/layouts/conversions/logger.ts
index f8b3247fe2bf6..debb1737ab95a 100644
--- a/src/core/server/logging/layouts/conversions/context.ts
+++ b/src/core/server/logging/layouts/conversions/logger.ts
@@ -22,8 +22,8 @@ import chalk from 'chalk';
 import { Conversion } from './type';
 import { LogRecord } from '../../log_record';
 
-export const ContextConversion: Conversion = {
-  pattern: /%context/g,
+export const LoggerConversion: Conversion = {
+  pattern: /%logger/g,
   convert(record: LogRecord, highlight: boolean) {
     let message = record.context;
     if (highlight) {
diff --git a/src/core/server/logging/layouts/layouts.test.ts b/src/core/server/logging/layouts/layouts.test.ts
index 5bd70a1e49e49..b1fb836f40d5d 100644
--- a/src/core/server/logging/layouts/layouts.test.ts
+++ b/src/core/server/logging/layouts/layouts.test.ts
@@ -56,7 +56,7 @@ test('`create()` creates correct layout.', () => {
   const patternLayout = Layouts.create({
     highlight: false,
     kind: 'pattern',
-    pattern: '[%date][%level][%context] $message',
+    pattern: '[%date][%level][%logger] %message',
   });
   expect(patternLayout).toBeInstanceOf(PatternLayout);
 
diff --git a/src/core/server/logging/layouts/pattern_layout.test.ts b/src/core/server/logging/layouts/pattern_layout.test.ts
index eb84812a670fe..cce55b147e0ed 100644
--- a/src/core/server/logging/layouts/pattern_layout.test.ts
+++ b/src/core/server/logging/layouts/pattern_layout.test.ts
@@ -112,7 +112,7 @@ test('`format()` correctly formats record with full pattern.', () => {
 });
 
 test('`format()` correctly formats record with custom pattern.', () => {
-  const layout = new PatternLayout('mock-%message-%context-%message');
+  const layout = new PatternLayout('mock-%message-%logger-%message');
 
   for (const record of records) {
     expect(layout.format(record)).toMatchSnapshot();
@@ -167,7 +167,7 @@ test('`format()` correctly formats record with highlighting.', () => {
 });
 
 test('allows specifying the PID in custom pattern', () => {
-  const layout = new PatternLayout('%pid-%context-%message');
+  const layout = new PatternLayout('%pid-%logger-%message');
 
   for (const record of records) {
     expect(layout.format(record)).toMatchSnapshot();
@@ -175,7 +175,7 @@ test('allows specifying the PID in custom pattern', () => {
 });
 
 test('`format()` allows specifying pattern with meta.', () => {
-  const layout = new PatternLayout('%context-%meta-%message');
+  const layout = new PatternLayout('%logger-%meta-%message');
   const record = {
     context: 'context',
     level: LogLevel.Debug,
@@ -207,31 +207,31 @@ describe('format', () => {
 
     describe('supports specifying a predefined format', () => {
       it('ISO8601', () => {
-        const layout = new PatternLayout('[%date{ISO8601}][%context]');
+        const layout = new PatternLayout('[%date{ISO8601}][%logger]');
 
         expect(layout.format(record)).toBe('[2012-02-01T14:30:22.011Z][context]');
       });
 
       it('ISO8601_TZ', () => {
-        const layout = new PatternLayout('[%date{ISO8601_TZ}][%context]');
+        const layout = new PatternLayout('[%date{ISO8601_TZ}][%logger]');
 
         expect(layout.format(record)).toBe('[2012-02-01T09:30:22.011-05:00][context]');
       });
 
       it('ABSOLUTE', () => {
-        const layout = new PatternLayout('[%date{ABSOLUTE}][%context]');
+        const layout = new PatternLayout('[%date{ABSOLUTE}][%logger]');
 
         expect(layout.format(record)).toBe('[09:30:22.011][context]');
       });
 
       it('UNIX', () => {
-        const layout = new PatternLayout('[%date{UNIX}][%context]');
+        const layout = new PatternLayout('[%date{UNIX}][%logger]');
 
         expect(layout.format(record)).toBe('[1328106622][context]');
       });
 
       it('UNIX_MILLIS', () => {
-        const layout = new PatternLayout('[%date{UNIX_MILLIS}][%context]');
+        const layout = new PatternLayout('[%date{UNIX_MILLIS}][%logger]');
 
         expect(layout.format(record)).toBe('[1328106622011][context]');
       });
@@ -239,38 +239,38 @@ describe('format', () => {
 
     describe('supports specifying a predefined format and timezone', () => {
       it('ISO8601', () => {
-        const layout = new PatternLayout('[%date{ISO8601}{America/Los_Angeles}][%context]');
+        const layout = new PatternLayout('[%date{ISO8601}{America/Los_Angeles}][%logger]');
 
         expect(layout.format(record)).toBe('[2012-02-01T14:30:22.011Z][context]');
       });
 
       it('ISO8601_TZ', () => {
-        const layout = new PatternLayout('[%date{ISO8601_TZ}{America/Los_Angeles}][%context]');
+        const layout = new PatternLayout('[%date{ISO8601_TZ}{America/Los_Angeles}][%logger]');
 
         expect(layout.format(record)).toBe('[2012-02-01T06:30:22.011-08:00][context]');
       });
 
       it('ABSOLUTE', () => {
-        const layout = new PatternLayout('[%date{ABSOLUTE}{America/Los_Angeles}][%context]');
+        const layout = new PatternLayout('[%date{ABSOLUTE}{America/Los_Angeles}][%logger]');
 
         expect(layout.format(record)).toBe('[06:30:22.011][context]');
       });
 
       it('UNIX', () => {
-        const layout = new PatternLayout('[%date{UNIX}{America/Los_Angeles}][%context]');
+        const layout = new PatternLayout('[%date{UNIX}{America/Los_Angeles}][%logger]');
 
         expect(layout.format(record)).toBe('[1328106622][context]');
       });
 
       it('UNIX_MILLIS', () => {
-        const layout = new PatternLayout('[%date{UNIX_MILLIS}{America/Los_Angeles}][%context]');
+        const layout = new PatternLayout('[%date{UNIX_MILLIS}{America/Los_Angeles}][%logger]');
 
         expect(layout.format(record)).toBe('[1328106622011][context]');
       });
     });
     it('formats several conversions patterns correctly', () => {
       const layout = new PatternLayout(
-        '[%date{ABSOLUTE}{America/Los_Angeles}][%context][%date{UNIX}]'
+        '[%date{ABSOLUTE}{America/Los_Angeles}][%logger][%date{UNIX}]'
       );
 
       expect(layout.format(record)).toBe('[06:30:22.011][context][1328106622]');
diff --git a/src/core/server/logging/layouts/pattern_layout.ts b/src/core/server/logging/layouts/pattern_layout.ts
index 212333ed56fa4..9490db149cc0f 100644
--- a/src/core/server/logging/layouts/pattern_layout.ts
+++ b/src/core/server/logging/layouts/pattern_layout.ts
@@ -23,7 +23,7 @@ import { LogRecord } from '../log_record';
 import { Layout } from './layouts';
 import {
   Conversion,
-  ContextConversion,
+  LoggerConversion,
   LevelConversion,
   MetaConversion,
   MessageConversion,
@@ -34,7 +34,7 @@ import {
 /**
  * Default pattern used by PatternLayout if it's not overridden in the configuration.
  */
-const DEFAULT_PATTERN = `[%date][%level][%context]%meta %message`;
+const DEFAULT_PATTERN = `[%date][%level][%logger]%meta %message`;
 
 export const patternSchema = schema.string({
   validate: string => {
@@ -49,7 +49,7 @@ const patternLayoutSchema = schema.object({
 });
 
 const conversions: Conversion[] = [
-  ContextConversion,
+  LoggerConversion,
   MessageConversion,
   LevelConversion,
   MetaConversion,