[Core/CMake] Fix some more reserved identifiers and rename a few defines

Oh crapple. I see, i'll try to submit a PR to that repo with these changes as well then!