Continuing naming conventions cleanup.