[issue #172 #175] fixing conventions