Fix some names of things