Issue #216 Fixed conventions