Issue #297 Updating conventions