Re #40 - Change sub-instance method and tag names