comment decorator staff
fix tempalte partial names