Fix overhead names and remove ambient setting of potion effects