Match Clang naming scheme a bit better