Merge pull request #2252 from christianv/CLC-3378-academics

CLC-3378 - Academics - Convert all JS variables to camelCase