Fixed member naming scheme to follow code style