Started converting names to camelCase