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