Fixed invalid names