Fix key names when adapter name is empty
Release 0.0.23