Returned to originally names. Deleted one unused js-file.