Update to reference config by short names