Tweaked naming convention