Issue #380 Fixed conventions