Morged android-port with name changes refactorization