some convention fixes
some convention fixes