Issue #402 - fix conventions