Name conventions fixed