Lose the ghastly package names!