Package naming fix