Changed identifiers from under_scored to camelCase