Changed some asset names
Manual merge