Fix compilation errors, Android naming scheme