[Core] Fix some more reserved identifiers

This goes together with a PR for the realmd repo atm.