[TASK] Updated Math related namespaces