changed some names to camelCase