Change naming to avoid conflicts with iOS (and hence incorrect reports from iTunesConnect about use of private selectors)