Fixed some names for the new coding style.