Minor naming conventions changes.