diff --git a/cmd/ebitenmobile/gomobile.go b/cmd/ebitenmobile/gomobile.go
index 846bbfe0f..55fd05c59 100644
--- a/cmd/ebitenmobile/gomobile.go
+++ b/cmd/ebitenmobile/gomobile.go
@@ -62,7 +62,7 @@ func removeAll(path string) error {
 }
 
 func runGo(args ...string) error {
-	// TODO: Remove this after Ebiten drops the support of Go 1.15 and older.
+	// TODO: Remove this after Ebitengine drops the support of Go 1.15 and older.
 	// GO111MODULE is on by default as of Go 1.16.
 	env := []string{
 		"GO111MODULE=on",
diff --git a/cmd/ebitenmobile/main.go b/cmd/ebitenmobile/main.go
index e046a35ed..08ba0b424 100644
--- a/cmd/ebitenmobile/main.go
+++ b/cmd/ebitenmobile/main.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// ebitenmobile is a wrapper of gomobile for Ebiten.
+// ebitenmobile is a wrapper of gomobile for Ebitengine.
 //
 // For the usage, see https://ebiten.org/documents/mobile.html.
 //
@@ -220,7 +220,7 @@ func doBind(args []string, flagset *flag.FlagSet, buildOS string) error {
 	}
 
 	if buildOS == "darwin" {
-		// TODO: Use os.ReadDir after Ebiten stops supporting Go 1.15.
+		// TODO: Use os.ReadDir after Ebitengine stops supporting Go 1.15.
 		f, err := os.Open(buildO)
 		if err != nil {
 			return err
diff --git a/ebitenutil/doc.go b/ebitenutil/doc.go
index c304503f6..9b31b6927 100644
--- a/ebitenutil/doc.go
+++ b/ebitenutil/doc.go
@@ -12,5 +12,5 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package ebitenutil provides utility functions for Ebiten.
+// Package ebitenutil provides utility functions for Ebitengine.
 package ebitenutil
diff --git a/examples/2048/main.go b/examples/2048/main.go
index 4b0fcc273..fa67105e7 100644
--- a/examples/2048/main.go
+++ b/examples/2048/main.go
@@ -30,7 +30,7 @@ func main() {
 		log.Fatal(err)
 	}
 	ebiten.SetWindowSize(twenty48.ScreenWidth, twenty48.ScreenHeight)
-	ebiten.SetWindowTitle("2048 (Ebiten Demo)")
+	ebiten.SetWindowTitle("2048 (Ebitengine Demo)")
 	if err := ebiten.RunGame(game); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/additive/main.go b/examples/additive/main.go
index 8192554f3..b82285bed 100644
--- a/examples/additive/main.go
+++ b/examples/additive/main.go
@@ -81,7 +81,7 @@ func main() {
 	ebitenImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Additive Blending (Ebiten Demo)")
+	ebiten.SetWindowTitle("Additive Blending (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/address/main.go b/examples/address/main.go
index 9bd18c8e4..65cde68ef 100644
--- a/examples/address/main.go
+++ b/examples/address/main.go
@@ -120,7 +120,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Sampler Address (Ebiten Demo)")
+	ebiten.SetWindowTitle("Sampler Address (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/airship/main.go b/examples/airship/main.go
index 524c266a3..1b8f492ff 100644
--- a/examples/airship/main.go
+++ b/examples/airship/main.go
@@ -280,7 +280,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Air Ship (Ebiten Demo)")
+	ebiten.SetWindowTitle("Air Ship (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/alphablending/main.go b/examples/alphablending/main.go
index 11ac8e6c4..e862f645e 100644
--- a/examples/alphablending/main.go
+++ b/examples/alphablending/main.go
@@ -90,7 +90,7 @@ func main() {
 	ebitenImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Alpha Blending (Ebiten Demo)")
+	ebiten.SetWindowTitle("Alpha Blending (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/animation/main.go b/examples/animation/main.go
index cac59bf09..ee985e514 100644
--- a/examples/animation/main.go
+++ b/examples/animation/main.go
@@ -76,7 +76,7 @@ func main() {
 	runnerImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Animation (Ebiten Demo)")
+	ebiten.SetWindowTitle("Animation (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/audio/main.go b/examples/audio/main.go
index 7c6973af5..d66f518d0 100644
--- a/examples/audio/main.go
+++ b/examples/audio/main.go
@@ -453,7 +453,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Audio (Ebiten Demo)")
+	ebiten.SetWindowTitle("Audio (Ebitengine Demo)")
 	g, err := NewGame()
 	if err != nil {
 		log.Fatal(err)
diff --git a/examples/audioinfiniteloop/main.go b/examples/audioinfiniteloop/main.go
index 5cca5b08b..a6eeea3ab 100644
--- a/examples/audioinfiniteloop/main.go
+++ b/examples/audioinfiniteloop/main.go
@@ -96,7 +96,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Audio Infinite Loop (Ebiten Demo)")
+	ebiten.SetWindowTitle("Audio Infinite Loop (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/audiopanning/main.go b/examples/audiopanning/main.go
index fbc10dcd8..6a5a78405 100644
--- a/examples/audiopanning/main.go
+++ b/examples/audiopanning/main.go
@@ -133,7 +133,7 @@ func main() {
 	ebitenImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Audio Panning Loop (Ebiten Demo)")
+	ebiten.SetWindowTitle("Audio Panning Loop (Ebitengine Demo)")
 	g := &Game{}
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
diff --git a/examples/blocks/main.go b/examples/blocks/main.go
index 6a5858633..cccfc8dbd 100644
--- a/examples/blocks/main.go
+++ b/examples/blocks/main.go
@@ -43,7 +43,7 @@ func main() {
 	}
 
 	ebiten.SetWindowSize(blocks.ScreenWidth*2, blocks.ScreenHeight*2)
-	ebiten.SetWindowTitle("Blocks (Ebiten Demo)")
+	ebiten.SetWindowTitle("Blocks (Ebitengine Demo)")
 	if err := ebiten.RunGame(&blocks.Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/blur/main.go b/examples/blur/main.go
index 4623c5fce..760fee3d7 100644
--- a/examples/blur/main.go
+++ b/examples/blur/main.go
@@ -64,7 +64,7 @@ func (g *Game) Draw(screen *ebiten.Image) {
 			op.GeoM.Translate(float64(i), 244+float64(j))
 			// This is a blur based on the CompositerModeSourceOver composition mode,
 			// which is basically (GL_ONE, GL_ONE_MINUS_SRC_ALPHA). ColorM acts
-			// on unpremultiplied colors, but all Ebiten internal colors are
+			// on unpremultiplied colors, but all Ebitengine internal colors are
 			// premultiplied, meaning this mode is regular alpha blending,
 			// computing each destination pixel as srcPix * alpha + dstPix * (1 - alpha).
 			//
@@ -103,7 +103,7 @@ func main() {
 	gophersImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Blur (Ebiten Demo)")
+	ebiten.SetWindowTitle("Blur (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/camera/main.go b/examples/camera/main.go
index 964ff522e..c5efb0e92 100644
--- a/examples/camera/main.go
+++ b/examples/camera/main.go
@@ -260,7 +260,7 @@ func main() {
 	g.world = ebiten.NewImage(worldWidth, worldHeight)
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Tiles (Ebiten Demo)")
+	ebiten.SetWindowTitle("Tiles (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/clip/main.go b/examples/clip/main.go
index 0a4b476f5..48df6f482 100644
--- a/examples/clip/main.go
+++ b/examples/clip/main.go
@@ -84,7 +84,7 @@ func main() {
 	gophersImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Clip (Ebiten Demo)")
+	ebiten.SetWindowTitle("Clip (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/contextlost/main.go b/examples/contextlost/main.go
index fb3a9f21b..18ef106c2 100644
--- a/examples/contextlost/main.go
+++ b/examples/contextlost/main.go
@@ -106,7 +106,7 @@ func main() {
 	}
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Context Lost (Ebiten Demo)")
+	ebiten.SetWindowTitle("Context Lost (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/cursor/main.go b/examples/cursor/main.go
index 2cc231c61..bb5907318 100644
--- a/examples/cursor/main.go
+++ b/examples/cursor/main.go
@@ -96,7 +96,7 @@ func main() {
 	}
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Cursor (Ebiten Demo)")
+	ebiten.SetWindowTitle("Cursor (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/doomfire/main.go b/examples/doomfire/main.go
index 72ed2bc68..cca379e93 100644
--- a/examples/doomfire/main.go
+++ b/examples/doomfire/main.go
@@ -145,7 +145,7 @@ func main() {
 	rand.Seed(time.Now().UnixNano())
 
 	ebiten.SetWindowSize(screenWidth*6, screenHeight*6)
-	ebiten.SetWindowTitle("Doom Fire (Ebiten Demo)")
+	ebiten.SetWindowTitle("Doom Fire (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/drag/main.go b/examples/drag/main.go
index 1f84e76fa..fe2eea2e1 100644
--- a/examples/drag/main.go
+++ b/examples/drag/main.go
@@ -315,7 +315,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Drag & Drop (Ebiten Demo)")
+	ebiten.SetWindowTitle("Drag & Drop (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/filter/main.go b/examples/filter/main.go
index e8f653c93..018505986 100644
--- a/examples/filter/main.go
+++ b/examples/filter/main.go
@@ -78,7 +78,7 @@ func main() {
 	ebitenImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Filter (Ebiten Demo)")
+	ebiten.SetWindowTitle("Filter (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/flappy/main.go b/examples/flappy/main.go
index abcb81e24..c83d8c9ed 100644
--- a/examples/flappy/main.go
+++ b/examples/flappy/main.go
@@ -437,7 +437,7 @@ func (g *Game) drawGopher(screen *ebiten.Image) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Flappy Gopher (Ebiten Demo)")
+	ebiten.SetWindowTitle("Flappy Gopher (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		panic(err)
 	}
diff --git a/examples/flood/main.go b/examples/flood/main.go
index 945021414..7a723da51 100644
--- a/examples/flood/main.go
+++ b/examples/flood/main.go
@@ -102,7 +102,7 @@ func main() {
 	ebitenImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Flood fill with solid colors (Ebiten Demo)")
+	ebiten.SetWindowTitle("Flood fill with solid colors (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/font/main.go b/examples/font/main.go
index 96dafefaa..4c70e7a6e 100644
--- a/examples/font/main.go
+++ b/examples/font/main.go
@@ -167,7 +167,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Font (Ebiten Demo)")
+	ebiten.SetWindowTitle("Font (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/fullscreen/main.go b/examples/fullscreen/main.go
index 74817efbf..6114abcee 100644
--- a/examples/fullscreen/main.go
+++ b/examples/fullscreen/main.go
@@ -127,7 +127,7 @@ func main() {
 	initFont()
 
 	ebiten.SetFullscreen(true)
-	ebiten.SetWindowTitle("Fullscreen (Ebiten Demo)")
+	ebiten.SetWindowTitle("Fullscreen (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/gamepad/main.go b/examples/gamepad/main.go
index e238eb516..723057daa 100644
--- a/examples/gamepad/main.go
+++ b/examples/gamepad/main.go
@@ -211,7 +211,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Gamepad (Ebiten Demo)")
+	ebiten.SetWindowTitle("Gamepad (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/highdpi/main.go b/examples/highdpi/main.go
index c4c0f0a71..45f92f4c5 100644
--- a/examples/highdpi/main.go
+++ b/examples/highdpi/main.go
@@ -108,7 +108,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(640, 480)
-	ebiten.SetWindowTitle("High DPI (Ebiten Demo)")
+	ebiten.SetWindowTitle("High DPI (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/hsv/main.go b/examples/hsv/main.go
index 64f07d4c9..3be0dc600 100644
--- a/examples/hsv/main.go
+++ b/examples/hsv/main.go
@@ -150,7 +150,7 @@ func main() {
 	gophersImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("HSV (Ebiten Demo)")
+	ebiten.SetWindowTitle("HSV (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/hue/main.go b/examples/hue/main.go
index 984f7790e..37e6f1961 100644
--- a/examples/hue/main.go
+++ b/examples/hue/main.go
@@ -76,7 +76,7 @@ func main() {
 	gophersImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Hue (Ebiten Demo)")
+	ebiten.SetWindowTitle("Hue (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/infinitescroll/main.go b/examples/infinitescroll/main.go
index 6945ac11f..04f33eaa8 100644
--- a/examples/infinitescroll/main.go
+++ b/examples/infinitescroll/main.go
@@ -104,7 +104,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Infinite Scroll (Ebiten Demo)")
+	ebiten.SetWindowTitle("Infinite Scroll (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/isometric/main.go b/examples/isometric/main.go
index 31e261ee1..3c6821da8 100644
--- a/examples/isometric/main.go
+++ b/examples/isometric/main.go
@@ -24,7 +24,7 @@ import (
 )
 
 func main() {
-	ebiten.SetWindowTitle("Isometric (Ebiten Demo)")
+	ebiten.SetWindowTitle("Isometric (Ebitengine Demo)")
 	ebiten.SetWindowSize(640, 480)
 	ebiten.SetWindowResizable(true)
 
diff --git a/examples/keyboard/main.go b/examples/keyboard/main.go
index 695730235..40bd431af 100644
--- a/examples/keyboard/main.go
+++ b/examples/keyboard/main.go
@@ -94,7 +94,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Keyboard (Ebiten Demo)")
+	ebiten.SetWindowTitle("Keyboard (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/lasttouch/main.go b/examples/lasttouch/main.go
index 9396f485b..d96245198 100644
--- a/examples/lasttouch/main.go
+++ b/examples/lasttouch/main.go
@@ -80,7 +80,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Last Touch Positions (Ebiten Demo)")
+	ebiten.SetWindowTitle("Last Touch Positions (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/life/main.go b/examples/life/main.go
index 0467b2ca9..b0085dfa1 100644
--- a/examples/life/main.go
+++ b/examples/life/main.go
@@ -184,7 +184,7 @@ func main() {
 	}
 
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Game of Life (Ebiten Demo)")
+	ebiten.SetWindowTitle("Game of Life (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/mandelbrot/main.go b/examples/mandelbrot/main.go
index 32dca063d..9c0df6e07 100644
--- a/examples/mandelbrot/main.go
+++ b/examples/mandelbrot/main.go
@@ -102,7 +102,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Mandelbrot (Ebiten Demo)")
+	ebiten.SetWindowTitle("Mandelbrot (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/masking/main.go b/examples/masking/main.go
index 2a0a56070..bcf20dea5 100644
--- a/examples/masking/main.go
+++ b/examples/masking/main.go
@@ -167,7 +167,7 @@ func min(a, b int) int {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Masking (Ebiten Demo)")
+	ebiten.SetWindowTitle("Masking (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/minify/main.go b/examples/minify/main.go
index 78878760b..e523f2d74 100644
--- a/examples/minify/main.go
+++ b/examples/minify/main.go
@@ -111,7 +111,7 @@ func main() {
 	gophersImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Minify (Ebiten Demo)")
+	ebiten.SetWindowTitle("Minify (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/moire/main.go b/examples/moire/main.go
index 58d37e0b8..dfd029d69 100644
--- a/examples/moire/main.go
+++ b/examples/moire/main.go
@@ -15,7 +15,7 @@
 //go:build example
 // +build example
 
-// This example is just to check if Ebiten can draw fine checker pattern evenly.
+// This example is just to check if Ebitengine can draw fine checker pattern evenly.
 // If there is something wrong in the implementation, the result might include
 // uneven patterns (#459).
 package main
@@ -101,7 +101,7 @@ func main() {
 		scale: initScreenScale,
 	}
 	ebiten.SetWindowSize(screenWidth*initScreenScale, screenHeight*initScreenScale)
-	ebiten.SetWindowTitle("Moire (Ebiten Demo)")
+	ebiten.SetWindowTitle("Moire (Ebitengine Demo)")
 	ebiten.SetWindowResizable(true)
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
diff --git a/examples/mosaic/main.go b/examples/mosaic/main.go
index 2b78d44f0..719e03fd9 100644
--- a/examples/mosaic/main.go
+++ b/examples/mosaic/main.go
@@ -81,7 +81,7 @@ func main() {
 		gophersRenderTarget: ebiten.NewImage(w/mosaicRatio, h/mosaicRatio),
 	}
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Mosaic (Ebiten Demo)")
+	ebiten.SetWindowTitle("Mosaic (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/noise/main.go b/examples/noise/main.go
index 502fcdcf0..7f5382e66 100644
--- a/examples/noise/main.go
+++ b/examples/noise/main.go
@@ -74,7 +74,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Noise (Ebiten Demo)")
+	ebiten.SetWindowTitle("Noise (Ebitengine Demo)")
 	g := &Game{
 		noiseImage: image.NewRGBA(image.Rect(0, 0, screenWidth, screenHeight)),
 	}
diff --git a/examples/paint/main.go b/examples/paint/main.go
index abcac03fa..c1fce491d 100644
--- a/examples/paint/main.go
+++ b/examples/paint/main.go
@@ -144,7 +144,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Paint (Ebiten Demo)")
+	ebiten.SetWindowTitle("Paint (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/particles/main.go b/examples/particles/main.go
index cf70bb9f7..76eccc253 100644
--- a/examples/particles/main.go
+++ b/examples/particles/main.go
@@ -173,7 +173,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Particles (Ebiten demo)")
+	ebiten.SetWindowTitle("Particles (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/pcm/main.go b/examples/pcm/main.go
index 5bde406c6..02d8a50bd 100644
--- a/examples/pcm/main.go
+++ b/examples/pcm/main.go
@@ -166,7 +166,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("PCM (Ebiten Demo)")
+	ebiten.SetWindowTitle("PCM (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/perspective/main.go b/examples/perspective/main.go
index 467737ccc..d60b13262 100644
--- a/examples/perspective/main.go
+++ b/examples/perspective/main.go
@@ -81,7 +81,7 @@ func main() {
 	gophersImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Perspective (Ebiten Demo)")
+	ebiten.SetWindowTitle("Perspective (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/piano/main.go b/examples/piano/main.go
index 9b4502f94..2785d91a7 100644
--- a/examples/piano/main.go
+++ b/examples/piano/main.go
@@ -238,7 +238,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Piano (Ebiten Demo)")
+	ebiten.SetWindowTitle("Piano (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/platformer/main.go b/examples/platformer/main.go
index 68f6dd493..66e47ef08 100644
--- a/examples/platformer/main.go
+++ b/examples/platformer/main.go
@@ -163,7 +163,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Platformer (Ebiten Demo)")
+	ebiten.SetWindowTitle("Platformer (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		panic(err)
 	}
diff --git a/examples/polygons/main.go b/examples/polygons/main.go
index 313311c39..9d6cc3448 100644
--- a/examples/polygons/main.go
+++ b/examples/polygons/main.go
@@ -140,7 +140,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Polygons (Ebiten Demo)")
+	ebiten.SetWindowTitle("Polygons (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{ngon: 10}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/raycasting/main.go b/examples/raycasting/main.go
index 8a58de006..d2803d753 100644
--- a/examples/raycasting/main.go
+++ b/examples/raycasting/main.go
@@ -313,7 +313,7 @@ func main() {
 	g.objects = append(g.objects, object{rect(150, 50, 30, 60)})
 
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Ray casting and shadows (Ebiten demo)")
+	ebiten.SetWindowTitle("Ray casting and shadows (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/realtimepcm/main.go b/examples/realtimepcm/main.go
index 052466e60..a55d51552 100644
--- a/examples/realtimepcm/main.go
+++ b/examples/realtimepcm/main.go
@@ -135,7 +135,7 @@ func (g *Game) Update() error {
 		g.player.Play()
 
 		// Adjust the buffer size to reflect the audio source changes in real time.
-		// Note that Ebiten doesn't guarantee the audio quality when the buffer size is modified.
+		// Note that Ebitengine doesn't guarantee the audio quality when the buffer size is modified.
 		// 1/20[s] should work in most cases, but this might cause glitches in some environments.
 		g.player.SetBufferSize(time.Second / 20)
 	}
@@ -153,7 +153,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Real Time PCM (Ebiten Demo)")
+	ebiten.SetWindowTitle("Real Time PCM (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/rotate/main.go b/examples/rotate/main.go
index 8eeacb11e..83d90314c 100644
--- a/examples/rotate/main.go
+++ b/examples/rotate/main.go
@@ -81,7 +81,7 @@ func main() {
 	gophersImage = ebiten.NewImageFromImage(img)
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Rotate (Ebiten Demo)")
+	ebiten.SetWindowTitle("Rotate (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/set/main.go b/examples/set/main.go
index 27d0db702..ca2ab70e8 100644
--- a/examples/set/main.go
+++ b/examples/set/main.go
@@ -72,7 +72,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Set (Ebiten Demo)")
+	ebiten.SetWindowTitle("Set (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/shader/main.go b/examples/shader/main.go
index 8ef28aa19..f9e291b1d 100644
--- a/examples/shader/main.go
+++ b/examples/shader/main.go
@@ -149,7 +149,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Shader (Ebiten Demo)")
+	ebiten.SetWindowTitle("Shader (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/shapes/main.go b/examples/shapes/main.go
index d91a7849e..d9856bf72 100644
--- a/examples/shapes/main.go
+++ b/examples/shapes/main.go
@@ -187,7 +187,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Shapes (Ebiten Demo)")
+	ebiten.SetWindowTitle("Shapes (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/sinewave/main.go b/examples/sinewave/main.go
index cc50f53b9..629cd29f9 100644
--- a/examples/sinewave/main.go
+++ b/examples/sinewave/main.go
@@ -117,7 +117,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Sine Wave (Ebiten Demo)")
+	ebiten.SetWindowTitle("Sine Wave (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/snake/main.go b/examples/snake/main.go
index 2eb12f94c..7fa55d817 100644
--- a/examples/snake/main.go
+++ b/examples/snake/main.go
@@ -202,7 +202,7 @@ func newGame() *Game {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Snake (Ebiten Demo)")
+	ebiten.SetWindowTitle("Snake (Ebitengine Demo)")
 	if err := ebiten.RunGame(newGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/sprites/main.go b/examples/sprites/main.go
index 5b976e1c5..adad94370 100644
--- a/examples/sprites/main.go
+++ b/examples/sprites/main.go
@@ -216,7 +216,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Sprites (Ebiten Demo)")
+	ebiten.SetWindowTitle("Sprites (Ebitengine Demo)")
 	ebiten.SetWindowResizable(true)
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
diff --git a/examples/spriteshd/main.go b/examples/spriteshd/main.go
index 344768203..9c6d3b3e2 100644
--- a/examples/spriteshd/main.go
+++ b/examples/spriteshd/main.go
@@ -198,7 +198,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetFullscreen(true)
-	ebiten.SetWindowTitle("Sprites HD (Ebiten Demo)")
+	ebiten.SetWindowTitle("Sprites HD (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/squiral/main.go b/examples/squiral/main.go
index 5114f41ca..b3a9114c9 100644
--- a/examples/squiral/main.go
+++ b/examples/squiral/main.go
@@ -353,7 +353,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 func main() {
 	ebiten.SetTPS(250)
 	ebiten.SetWindowSize(width*scale, height*scale)
-	ebiten.SetWindowTitle("Squirals (Ebiten Demo)")
+	ebiten.SetWindowTitle("Squirals (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/stars/main.go b/examples/stars/main.go
index ce7397b48..1d7347892 100644
--- a/examples/stars/main.go
+++ b/examples/stars/main.go
@@ -101,7 +101,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 func main() {
 	rand.Seed(time.Now().UnixNano())
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Stars (Ebiten Demo)")
+	ebiten.SetWindowTitle("Stars (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/text/main.go b/examples/text/main.go
index c7103ec88..4f789ad2a 100644
--- a/examples/text/main.go
+++ b/examples/text/main.go
@@ -155,7 +155,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Text (Ebiten Demo)")
+	ebiten.SetWindowTitle("Text (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/tiles/main.go b/examples/tiles/main.go
index f3a158e9e..3bb07e766 100644
--- a/examples/tiles/main.go
+++ b/examples/tiles/main.go
@@ -134,7 +134,7 @@ func main() {
 	}
 
 	ebiten.SetWindowSize(screenWidth*2, screenHeight*2)
-	ebiten.SetWindowTitle("Tiles (Ebiten Demo)")
+	ebiten.SetWindowTitle("Tiles (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/touch/main.go b/examples/touch/main.go
index c1b23cb03..a6199bf91 100644
--- a/examples/touch/main.go
+++ b/examples/touch/main.go
@@ -248,7 +248,7 @@ func main() {
 	}
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Touch (Ebiten Demo)")
+	ebiten.SetWindowTitle("Touch (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/typewriter/main.go b/examples/typewriter/main.go
index df53a998f..dbca529b5 100644
--- a/examples/typewriter/main.go
+++ b/examples/typewriter/main.go
@@ -102,7 +102,7 @@ func main() {
 	}
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("TypeWriter (Ebiten Demo)")
+	ebiten.SetWindowTitle("TypeWriter (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/ui/main.go b/examples/ui/main.go
index 22ab5f99f..407c9a528 100644
--- a/examples/ui/main.go
+++ b/examples/ui/main.go
@@ -508,7 +508,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("UI (Ebiten Demo)")
+	ebiten.SetWindowTitle("UI (Ebitengine Demo)")
 	if err := ebiten.RunGame(NewGame()); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/vector/main.go b/examples/vector/main.go
index 9c5f9aef4..622dc7cb7 100644
--- a/examples/vector/main.go
+++ b/examples/vector/main.go
@@ -264,7 +264,7 @@ func main() {
 	g := &Game{counter: 0}
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Vector (Ebiten Demo)")
+	ebiten.SetWindowTitle("Vector (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/vibrate/main.go b/examples/vibrate/main.go
index 1cf6cfe71..36a72fc41 100644
--- a/examples/vibrate/main.go
+++ b/examples/vibrate/main.go
@@ -82,7 +82,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 }
 
 func main() {
-	ebiten.SetWindowTitle("Vibrate (Ebiten Demo)")
+	ebiten.SetWindowTitle("Vibrate (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/wav/main.go b/examples/wav/main.go
index f760ff5c6..3c8c87b54 100644
--- a/examples/wav/main.go
+++ b/examples/wav/main.go
@@ -104,7 +104,7 @@ func main() {
 		log.Fatal(err)
 	}
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("WAV (Ebiten Demo)")
+	ebiten.SetWindowTitle("WAV (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/wheel/main.go b/examples/wheel/main.go
index 9fb67c337..6d7d82c04 100644
--- a/examples/wheel/main.go
+++ b/examples/wheel/main.go
@@ -67,7 +67,7 @@ func main() {
 	g := &Game{x: 0.0, y: 0.0}
 
 	ebiten.SetWindowSize(screenWidth, screenHeight)
-	ebiten.SetWindowTitle("Wheel (Ebiten Demo)")
+	ebiten.SetWindowTitle("Wheel (Ebitengine Demo)")
 	if err := ebiten.RunGame(g); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/windowclosing/main.go b/examples/windowclosing/main.go
index 982edd871..9db3a329b 100644
--- a/examples/windowclosing/main.go
+++ b/examples/windowclosing/main.go
@@ -58,7 +58,7 @@ func (g *Game) Layout(outsideWidth, outsideHeight int) (int, int) {
 
 func main() {
 	ebiten.SetWindowClosingHandled(true)
-	ebiten.SetWindowTitle("Window Closing (Ebiten Demo)")
+	ebiten.SetWindowTitle("Window Closing (Ebitengine Demo)")
 	if err := ebiten.RunGame(&Game{}); err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/windowsize/main.go b/examples/windowsize/main.go
index 674bb5e1b..1ab2958fb 100644
--- a/examples/windowsize/main.go
+++ b/examples/windowsize/main.go
@@ -450,7 +450,7 @@ func main() {
 		ebiten.SetWindowResizingMode(ebiten.WindowResizingModeEnabled)
 	}
 
-	const title = "Window Size (Ebiten Demo)"
+	const title = "Window Size (Ebitengine Demo)"
 	ww := int(float64(g.width) * initScreenScale)
 	wh := int(float64(g.height) * initScreenScale)
 	ebiten.SetWindowSize(ww, wh)
diff --git a/input.go b/input.go
index e21f3eaa2..0438e6166 100644
--- a/input.go
+++ b/input.go
@@ -333,7 +333,7 @@ func IsStandardGamepadButtonAvailable(id GamepadID, button StandardGamepadButton
 //
 // One or more input definitions can be provided separated by newlines.
 // In particular, it is valid to pass an entire gamecontrollerdb.txt file.
-// Note though that Ebiten already includes its own copy of this file,
+// Note though that Ebitengine already includes its own copy of this file,
 // so this call should only be necessary to add mappings for hardware not supported yet;
 // ideally games using the StandardGamepad* functions should allow the user to provide mappings and
 // then call this function if provided.
@@ -349,7 +349,7 @@ func IsStandardGamepadButtonAvailable(id GamepadID, button StandardGamepadButton
 //	"iOS":      GOOS=ios
 //	"":         Any GOOS
 //
-// On platforms where gamepad mappings are not managed by Ebiten, this always returns false and nil.
+// On platforms where gamepad mappings are not managed by Ebitengine, this always returns false and nil.
 //
 // UpdateStandardGamepadLayoutMappings is concurrent-safe.
 //
diff --git a/internal/graphics/vertex.go b/internal/graphics/vertex.go
index 9ad420a08..46bd4b944 100644
--- a/internal/graphics/vertex.go
+++ b/internal/graphics/vertex.go
@@ -22,7 +22,7 @@ const (
 	ShaderImageCount = 4
 
 	// PreservedUniformVariablesCount represents the number of preserved uniform variables.
-	// Any shaders in Ebiten must have these uniform variables.
+	// Any shaders in Ebitengine must have these uniform variables.
 	PreservedUniformVariablesCount = 1 + // the destination texture size
 		1 + // the texture sizes array
 		1 + // the texture destination region's origin
diff --git a/internal/graphicsdriver/opengl/program.go b/internal/graphicsdriver/opengl/program.go
index a7a4325c6..128d056f7 100644
--- a/internal/graphicsdriver/opengl/program.go
+++ b/internal/graphicsdriver/opengl/program.go
@@ -88,7 +88,7 @@ func (a *arrayBufferLayout) disable(context *context) {
 	}
 }
 
-// theArrayBufferLayout is the array buffer layout for Ebiten.
+// theArrayBufferLayout is the array buffer layout for Ebitengine.
 var theArrayBufferLayout = arrayBufferLayout{
 	// Note that GL_MAX_VERTEX_ATTRIBS is at least 16.
 	parts: []arrayBufferLayoutPart{
diff --git a/internal/restorable/images.go b/internal/restorable/images.go
index 6f1b6fc71..5fa9b6a86 100644
--- a/internal/restorable/images.go
+++ b/internal/restorable/images.go
@@ -297,7 +297,7 @@ func OnContextLost() {
 	theImages.contextLost = true
 }
 
-// canDetectContextLostExplicitly reports whether Ebiten can detect a context lost in an explicit way.
+// canDetectContextLostExplicitly reports whether Ebitengine can detect a context lost in an explicit way.
 // On Android, a context lost can be detected via GLSurfaceView.Renderer.onSurfaceCreated.
 // On iOS w/ OpenGL ES, this can be detected only when gomobile-build is used.
 var canDetectContextLostExplicitly = runtime.GOOS == "android"
diff --git a/internal/thread/thread.go b/internal/thread/thread.go
index a046b6c99..9b11551b1 100644
--- a/internal/thread/thread.go
+++ b/internal/thread/thread.go
@@ -14,7 +14,7 @@
 
 package thread
 
-// Thread defines threading behavior in Ebiten.
+// Thread defines threading behavior in Ebitengine.
 type Thread interface {
 	Call(func())
 	Loop()
diff --git a/run_mobile.go b/run_mobile.go
index befb1cfc0..847058705 100644
--- a/run_mobile.go
+++ b/run_mobile.go
@@ -24,7 +24,7 @@ import (
 // RunGameWithoutMainLoop runs the game, but doesn't call the loop on the main (UI) thread.
 // RunGameWithoutMainLoop returns immediately unlike Run.
 //
-// Ebiten users should NOT call RunGameWithoutMainLoop.
+// Ebitengine users should NOT call RunGameWithoutMainLoop.
 // Instead, functions in github.com/hajimehoshi/ebiten/v2/mobile package calls this.
 //
 // TODO: Remove this. In order to remove this, the gameForUI should be in another package.
diff --git a/window.go b/window.go
index 364d2a03a..3aad808ee 100644
--- a/window.go
+++ b/window.go
@@ -23,8 +23,8 @@ import (
 
 // WindowResizingModeType represents a mode in which a user resizes the window.
 //
-// Regardless of the resizing mode, an Ebiten application can still change the window size or make
-// the window fullscreen by calling Ebiten functions.
+// Regardless of the resizing mode, an Ebitengine application can still change the window size or make
+// the window fullscreen by calling Ebitengine functions.
 type WindowResizingModeType = ui.WindowResizingMode
 
 // WindowResizingModeTypes