Changing to explicit use of android prefix, not finished