Changed namings. Exported to .js file.