Update shared consts after reoraganization