improved naming consistency; fixes #89