Issue #188 fixing conventions