More changes in order to implement the new account name.