updated internal naming consistency