Fix: Namespace clash
Overall assets update