Try to make instance names more consistent.  Shorten index/one hot conversion modules.