gundam: Adapt move of EntityRegister definition