consolidated groupoids
modernized vocabulary for Phantom