Also, make word labels consistent across new substitution words. Signed-off-by: Sarah Sharp <sharp@otter.technology>