[FIX] Fix Camel Case and , in endline