small navigation and naming fixes for Android