Change name and add package name