Change package to avoid conflicts