Change package name to remove conflict