Updated namespacing conventions