API-54 Update some namespaces references