misc name fixing