[Core] Fix some reserved identifiers

This goes together with another PR for zero atm.