Suspend names fix