(Android) Changes for filename naming convention changes