electronicarts: Improve some function/variable names