Refactor package with bad name