Renaming js and small fixes