diff --git a/src/models/pnid.ts b/src/models/pnid.ts
index bca37bb..264d0fe 100644
--- a/src/models/pnid.ts
+++ b/src/models/pnid.ts
@@ -202,7 +202,7 @@ PNIDSchema.method('generateMiiImages', async function generateMiiImages(): Promi
 	const mii = new Mii(Buffer.from(miiData, 'base64'));
 	const miiStudioUrl = mii.studioUrl({
 		type: 'face',
-		width: 128,
+		width: 96,
 		instanceCount: 1
 	});
 	const miiStudioNormalFaceImageData = await got(miiStudioUrl).buffer();
@@ -214,16 +214,22 @@ PNIDSchema.method('generateMiiImages', async function generateMiiImages(): Promi
 	await uploadCDNAsset(config.s3.bucket, `${userMiiKey}/standard.tga`, tga, 'public-read');
 	await uploadCDNAsset(config.s3.bucket, `${userMiiKey}/normal_face.png`, miiStudioNormalFaceImageData, 'public-read');
 
-	const expressions = ['frustrated', 'smile_open_mouth', 'wink_left', 'sorrow', 'surprise_open_mouth'];
-	for (const expression of expressions) {
+	const expressions = [
+		{ expression: 'frustrated', filename: 'frustrated_face' },
+		{ expression: 'smile_open_mouth', filename: 'happy_face' },
+		{ expression: 'wink_left', filename: 'like_face' },
+		{ expression: 'sorrow', filename: 'puzzled_face' },
+		{ expression: 'surprise_open_mouth', filename: 'surprised_face' }
+	];
+	for (const { expression, filename } of expressions) {
 		const miiStudioExpressionUrl = mii.studioUrl({
 			type: 'face',
 			expression: expression,
-			width: 128,
+			width: 96,
 			instanceCount: 1
 		});
 		const miiStudioExpressionImageData = await got(miiStudioExpressionUrl).buffer();
-		await uploadCDNAsset(config.s3.bucket, `${userMiiKey}/${expression}.png`, miiStudioExpressionImageData, 'public-read');
+		await uploadCDNAsset(config.s3.bucket, `${userMiiKey}/${filename}.png`, miiStudioExpressionImageData, 'public-read');
 	}
 
 	const miiStudioBodyUrl = mii.studioUrl({
@@ -232,7 +238,7 @@ PNIDSchema.method('generateMiiImages', async function generateMiiImages(): Promi
 		instanceCount: 1
 	});
 	const miiStudioBodyImageData = await got(miiStudioBodyUrl).buffer();
-	await uploadCDNAsset(config.s3.bucket, `${userMiiKey}/body.png`, miiStudioBodyImageData, 'public-read');
+	await uploadCDNAsset(config.s3.bucket, `${userMiiKey}/whole_body.png`, miiStudioBodyImageData, 'public-read');
 });
 
 PNIDSchema.method('markForDeletion', function markForDeletion() {
diff --git a/src/services/nnas/routes/miis.ts b/src/services/nnas/routes/miis.ts
index c128658..9850e3f 100644
--- a/src/services/nnas/routes/miis.ts
+++ b/src/services/nnas/routes/miis.ts
@@ -65,21 +65,21 @@ router.get('/', async (request: express.Request, response: express.Response): Pr
 							type: 'standard'
 						},
 						{
-							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/frustrated.png`,
+							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/frustrated_face.png`,
 							id: pnid.mii.id,
-							url: `${config.cdn.base_url}/mii/${pnid.pid}/frustrated.png`,
+							url: `${config.cdn.base_url}/mii/${pnid.pid}/frustrated_face.png`,
 							type: 'frustrated_face'
 						},
 						{
-							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/smile_open_mouth.png`,
+							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/happy_face.png`,
 							id: pnid.mii.id,
-							url: `${config.cdn.base_url}/mii/${pnid.pid}/smile_open_mouth.png`,
+							url: `${config.cdn.base_url}/mii/${pnid.pid}/happy_face.png`,
 							type: 'happy_face'
 						},
 						{
-							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/wink_left.png`,
+							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/like_face.png`,
 							id: pnid.mii.id,
-							url: `${config.cdn.base_url}/mii/${pnid.pid}/wink_left.png`,
+							url: `${config.cdn.base_url}/mii/${pnid.pid}/like_face.png`,
 							type: 'like_face'
 						},
 						{
@@ -89,21 +89,21 @@ router.get('/', async (request: express.Request, response: express.Response): Pr
 							type: 'normal_face'
 						},
 						{
-							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/sorrow.png`,
+							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/puzzled_face.png`,
 							id: pnid.mii.id,
-							url: `${config.cdn.base_url}/mii/${pnid.pid}/sorrow.png`,
+							url: `${config.cdn.base_url}/mii/${pnid.pid}/puzzled_face.png`,
 							type: 'puzzled_face'
 						},
 						{
-							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/surprised_open_mouth.png`,
+							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/surprised_face.png`,
 							id: pnid.mii.id,
-							url: `${config.cdn.base_url}/mii/${pnid.pid}/surprised_open_mouth.png`,
+							url: `${config.cdn.base_url}/mii/${pnid.pid}/surprised_face.png`,
 							type: 'surprised_face'
 						},
 						{
-							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/body.png`,
+							cached_url: `${config.cdn.base_url}/mii/${pnid.pid}/whole_body.png`,
 							id: pnid.mii.id,
-							url: `${config.cdn.base_url}/mii/${pnid.pid}/body.png`,
+							url: `${config.cdn.base_url}/mii/${pnid.pid}/whole_body.png`,
 							type: 'whole_body'
 						}
 					]
@@ -127,4 +127,4 @@ router.get('/', async (request: express.Request, response: express.Response): Pr
 	}
 });
 
-export default router;
+export default router;