Changes to convention for consistency