Add -ivi to package name to prevent conflict with Main package