Updated internal class attributes with correct naming.