Tweaked module naming convention