Non-repetitive components no longer use _1 in names