diff --git a/packages/cli/src/commands/app/build.ts b/packages/cli/src/commands/app/build.ts
index 8b104d353c..482159e773 100644
--- a/packages/cli/src/commands/app/build.ts
+++ b/packages/cli/src/commands/app/build.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { buildBundle } from '../../lib/bundle';
+import { buildBundle } from '../../lib/bundler';
 import { Command } from 'commander';
 
 export default async (cmd: Command) => {
diff --git a/packages/cli/src/commands/app/serve.ts b/packages/cli/src/commands/app/serve.ts
index cc892d6669..143e4139e5 100644
--- a/packages/cli/src/commands/app/serve.ts
+++ b/packages/cli/src/commands/app/serve.ts
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import { startDevServer } from '../../lib/bundle';
+import { serveBundle } from '../../lib/bundler';
 import { Command } from 'commander';
 
 export default async (cmd: Command) => {
-  await startDevServer({
+  await serveBundle({
     entry: 'src/index',
     checksEnabled: cmd.check,
   });
diff --git a/packages/cli/src/commands/plugin/serve.ts b/packages/cli/src/commands/plugin/serve.ts
index 1616e15415..79a540d879 100644
--- a/packages/cli/src/commands/plugin/serve.ts
+++ b/packages/cli/src/commands/plugin/serve.ts
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import { startDevServer } from '../../lib/bundle';
+import { serveBundle } from '../../lib/bundler';
 import { Command } from 'commander';
 
 export default async (cmd: Command) => {
-  await startDevServer({
+  await serveBundle({
     entry: 'dev/index',
     checksEnabled: cmd.check,
   });
diff --git a/packages/cli/src/lib/bundle/bundle.ts b/packages/cli/src/lib/bundler/bundle.ts
similarity index 100%
rename from packages/cli/src/lib/bundle/bundle.ts
rename to packages/cli/src/lib/bundler/bundle.ts
diff --git a/packages/cli/src/lib/bundle/config.ts b/packages/cli/src/lib/bundler/config.ts
similarity index 100%
rename from packages/cli/src/lib/bundle/config.ts
rename to packages/cli/src/lib/bundler/config.ts
diff --git a/packages/cli/src/lib/bundle/index.ts b/packages/cli/src/lib/bundler/index.ts
similarity index 93%
rename from packages/cli/src/lib/bundle/index.ts
rename to packages/cli/src/lib/bundler/index.ts
index 7a1303f980..cdfb5f3897 100644
--- a/packages/cli/src/lib/bundle/index.ts
+++ b/packages/cli/src/lib/bundler/index.ts
@@ -15,4 +15,4 @@
  */
 
 export { buildBundle } from './bundle';
-export { startDevServer } from './server';
+export { serveBundle } from './server';
diff --git a/packages/cli/src/lib/bundle/optimization.ts b/packages/cli/src/lib/bundler/optimization.ts
similarity index 100%
rename from packages/cli/src/lib/bundle/optimization.ts
rename to packages/cli/src/lib/bundler/optimization.ts
diff --git a/packages/cli/src/lib/bundle/paths.ts b/packages/cli/src/lib/bundler/paths.ts
similarity index 100%
rename from packages/cli/src/lib/bundle/paths.ts
rename to packages/cli/src/lib/bundler/paths.ts
diff --git a/packages/cli/src/lib/bundle/server.ts b/packages/cli/src/lib/bundler/server.ts
similarity index 97%
rename from packages/cli/src/lib/bundle/server.ts
rename to packages/cli/src/lib/bundler/server.ts
index 4bbdfde581..ea29b04459 100644
--- a/packages/cli/src/lib/bundle/server.ts
+++ b/packages/cli/src/lib/bundler/server.ts
@@ -23,7 +23,7 @@ import { createConfig } from './config';
 import { ServeOptions } from './types';
 import { resolveBundlingPaths } from './paths';
 
-export async function startDevServer(options: ServeOptions) {
+export async function serveBundle(options: ServeOptions) {
   const host = process.env.HOST ?? '0.0.0.0';
   const defaultPort = parseInt(process.env.PORT ?? '', 10) || 3000;
 
diff --git a/packages/cli/src/lib/bundle/transforms.ts b/packages/cli/src/lib/bundler/transforms.ts
similarity index 100%
rename from packages/cli/src/lib/bundle/transforms.ts
rename to packages/cli/src/lib/bundler/transforms.ts
diff --git a/packages/cli/src/lib/bundle/types.ts b/packages/cli/src/lib/bundler/types.ts
similarity index 100%
rename from packages/cli/src/lib/bundle/types.ts
rename to packages/cli/src/lib/bundler/types.ts