Update names to comply with Google Play guidelines