[Core] Fix some reserved identifiers

This goes together with another PR (#217) for zero atm.