Conversion to js, renaming