Ref #37 - Missed few stragglers in refractoring names