Coding Standard and naming convention fixes