[issue #172] fixed conventions