Refactor package name to prevent confusion