Rename gem; misc cleanup