Use name instead of identifier for bundle name
Use a consistent naming scheme for Android and Mac products