Rename constant names.
Code formatting changes.