Rename + fix js includes