Extract Pacman class
Renames