Change package name appropriately