Changed a few conflicting def names