Renamed stuff to fit convention.