Fixed None's in name