Cleaned up some namings to match generic "The Ball Test"