Fix some wrong names from the previous commit