Fixed Android Naming Issues