changed to better local function names

2 jobs for 11-update-compiler-defines-to-latest-version in 7 minutes and 3 seconds (queued for 4 seconds)