[issue #172 #175] fixed conventions