Added missing unshaped names.