changed billing namespace to account