package rename to match Java conventions