Android naming changes