Fixed naming for athene and harpia.

Current naming scheme has been shown to be confusing to users. New
naming will match similar devices and the naming used for LineageOS.

Change-Id: I74829092f8e6d4469820a751f7093f301dfe411b
diff --git a/_motorola/motorolamotog2016.markdown b/_motorola/motorolamotog2016.markdown
index ce8a0f6..6e7382e 100644
--- a/_motorola/motorolamotog2016.markdown
+++ b/_motorola/motorolamotog2016.markdown
@@ -1,6 +1,6 @@
 ---
 layout: device
-title:  "Motorola Moto G Play 2016"
+title:  "Motorola Moto G4 Play"
 codename: harpia
 downloadfolder: harpia
 supportstatus: Current
diff --git a/_motorola/motorolamotogplus2016.markdown b/_motorola/motorolamotogplus2016.markdown
index 65537e9..c94419f 100644
--- a/_motorola/motorolamotogplus2016.markdown
+++ b/_motorola/motorolamotogplus2016.markdown
@@ -1,6 +1,6 @@
 ---
 layout: device
-title:  "Motorola Moto G 2016/Moto G Plus 2016"
+title:  "Motorola Moto G4/G4 Plus"
 codename: athene
 downloadfolder: athene
 supportstatus: Current