Changed a few references