Fixup keystone name