Added missing imports and renames for pacman