Revise code to follow clang identifier conventions