harmonized nameing styles, see issue #67