Fixes to naming, javascripts and languages