Fixed more of the old names, such as the context params