[Core] Fix some more reserved identifiers

This goes together with a PR (#1) for the realmd repo atm.