Final camelCase compliance for file names and remove whitespcae