Issue #18: renamed like described in issue.