Clean up naming logic.