LNT: snake_case cleanups