Fixing self and name issues in various node providers.