Fix an issue where instance variables had the same names as functions