[MODIFIED] Try to use a custom package name.