Make package name consistent.