resolve naming issues and add some naming consistency